From 8e63ca9bba888df0965f0beeed51a5336e6cb8cd Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 11 Jun 2018 10:55:42 -0400 Subject: 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/, and https://review.gluster.org/#/c/20207/ This patch changes uses of has_key() as suggested by the 2to3 utility. 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, imports2, input, intern, itertools, metaclass, methodattrs, ne, next, nonzero, operator, paren, raw_input, reduce, reload, renames, repr, standarderror, sys_exc, throw, tuple_params, xreadlines. Updates: #411 Change-Id: I79bda20f1583a0a1bb0320667498f4c137de93b3 Signed-off-by: Kaleb S. KEITHLEY --- xlators/features/glupy/examples/negative.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xlators/features') diff --git a/xlators/features/glupy/examples/negative.py b/xlators/features/glupy/examples/negative.py index 543f3109502..836008682ba 100644 --- a/xlators/features/glupy/examples/negative.py +++ b/xlators/features/glupy/examples/negative.py @@ -35,7 +35,7 @@ class xlator (Translator): pargfid = uuid2str(loc.contents.pargfid) print("lookup FOP: %s:%s" % (pargfid, loc.contents.name)) # Check the cache. - if cache.has_key(pargfid): + if pargfid in cache: if loc.contents.name in cache[pargfid]: print("short-circuiting for %s:%s" % (pargfid, loc.contents.name)) @@ -55,11 +55,11 @@ class xlator (Translator): # Update the cache. if op_ret == 0: print("found %s, removing from cache" % name) - if cache.has_key(pargfid): + if pargfid in cache: cache[pargfid].discard(name) elif op_errno == 2: # ENOENT print("failed to find %s, adding to cache" % name) - if cache.has_key(pargfid): + if pargfid in cache: cache[pargfid].add(name) else: cache[pargfid] = {name} @@ -85,7 +85,7 @@ class xlator (Translator): # Update the cache. if op_ret == 0: print("created %s, removing from cache" % name) - if cache.has_key(pargfid): + if pargfid in cache: cache[pargfid].discard(name) del self.requests[key] dl.unwind_create(frame,cookie,this,op_ret,op_errno,fd,inode,buf, -- cgit