diff options
author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-07-02 08:18:54 -0400 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-07-09 03:38:36 +0000 |
commit | 55d1b0531a0b322a1b851fc921fd6fdf25d26331 (patch) | |
tree | f3d8c84e4d27fb8894a9c921a9a4ed06257cf80e /extras/rebalance.py | |
parent | dab12ce093628860bf43c3e0c7eaf9099cf7a78f (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/,
https://review.gluster.org/#/c/20104/,
https://review.gluster.org/#/c/20162/,
https://review.gluster.org/#/c/20185/,
https://review.gluster.org/#/c/20207/,
https://review.gluster.org/#/c/20227/,
https://review.gluster.org/#/c/20307/,
https://review.gluster.org/#/c/20320/,
https://review.gluster.org/#/c/20332/, and
https://review.gluster.org/#/c/20364/
Fixes glupy.py python2isms, iteritems -> items, and some overlooked
print() in georep/peer_mountbroker.in
Note: Fedora packaging guidelines and SUSE rpmlint require explicit
shebangs; 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, has_key, idioms, map, numliterals, raise,
set_literal, types, urllib, and zip 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, imports2, input, intern,
itertools, metaclass, methodattrs, ne, next, nonzero, operator, paren,
raw_input, reduce, reload, renames, repr, standarderror, sys_exc, throw,
tuple_params, xreadlines.
Change-Id: Idda031c1ec975417c79323aea33e7b694e752b2a
updates: #411
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'extras/rebalance.py')
-rwxr-xr-x | extras/rebalance.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/rebalance.py b/extras/rebalance.py index 32ca067b32d..0023f9970a8 100755 --- a/extras/rebalance.py +++ b/extras/rebalance.py @@ -49,7 +49,7 @@ def generate_stanza (vf, all_xlators, cur_subvol): sv_list.append(sv.name) vf.write("volume %s\n"%cur_subvol.name) vf.write(" type %s\n"%cur_subvol.type) - for kvpair in cur_subvol.opts.iteritems(): + for kvpair in cur_subvol.opts.items(): vf.write(" option %s %s\n"%kvpair) if sv_list: vf.write(" subvolumes %s\n"%string.join(sv_list)) |