diff options
author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-06-07 12:27:23 -0400 |
---|---|---|
committer | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-06-07 12:37:43 -0400 |
commit | ee75c5abc41f43aa79b5e758e43f70a92672d3a2 (patch) | |
tree | 67433fa9021a2f85b861f8dbee0df3a46ae04e45 /libglusterfs/src | |
parent | d788cc59b1cd4278ca0b8b2d9f6fe93f80550af3 (diff) |
core/various: python3 compat, prepare for python2 -> python3
see https://review.gluster.org/#/c/19788/,
https://review.gluster.org/#/c/19871/,
https://review.gluster.org/#/c/19952/, and
https://review.gluster.org/#/c/20104/
https://review.gluster.org/#/c/20162/
This patch changes uses of map() and raise(), and a few cases of print()
that were overlooked in the prior patch that fixed print.
Note: Fedora packaging guidelines require explicit shebangs, so popular
practices like #!/usr/bin/env python and #!/usr/bin/python are not
allowed; they must be #!/usr/bin/python2 or #!/usr/bin/python3
Note: Selected small fixes from 2to3 utility. Specifically apply,
basestring, funcattrs, idioms, numliterals, set_literal, types, urllib,
zip, map, and raise have already been applied. Also version agnostic
imports for urllib, cpickle, socketserver, _thread, queue, etc., suggested
by Aravinda in https://review.gluster.org/#/c/19767/1
Note: these 2to3 fixes report no changes are necessary: asserts, buffer,
exec, execfile, exitfunc, filter, getcwdu, intern, itertools, metaclass,
methodattrs, ne, next, nonzero, operator, paren, raw_input, reduce,
reload, renames, repr, standarderror, sys_exc, throw, tuple_params,
xreadlines.
Change-Id: Id62ea491e4ab5dd390075c5c6d9d889cf6f9da27
updates: #411
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'libglusterfs/src')
-rwxr-xr-x | libglusterfs/src/generator.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libglusterfs/src/generator.py b/libglusterfs/src/generator.py index 09f9727f760..e73cb0cb0b1 100755 --- a/libglusterfs/src/generator.py +++ b/libglusterfs/src/generator.py @@ -720,14 +720,14 @@ def get_subs (names, types, cbktypes=None): # Convert two separate tuples to one of (name, type) sub-tuples. as_tuples = list(zip(types,names)) # Convert each sub-tuple into a "type name" string. - as_strings = map(string.join,as_tuples) + as_strings = list(map(string.join,as_tuples)) # Join all of those into one big string. sdict["@LONG_ARGS@"] = string.join(as_strings,",\n\t") # So much more readable than string.join(map(string.join,zip(...)))) - sdict["@ERROR_ARGS@"] = string.join(map(get_error_arg,types),", ") + sdict["@ERROR_ARGS@"] = string.join(list(map(get_error_arg,types)),", ") if cbktypes is not None: - sdict["@CBK_ERROR_ARGS@"] = string.join(map( - get_error_arg,cbktypes),", ") + sdict["@CBK_ERROR_ARGS@"] = string.join(list(map( + get_error_arg,cbktypes)),", ") return sdict def generate (tmpl, name, subs): |