From 7cdcd9b022180ee279f6408f7daaa882a8266f3a Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 30 May 2018 08:15:29 -0400 Subject: core/various: python3 compat, prepare for python2 -> python3 see https://review.gluster.org/#/c/19788/, https://review.gluster.org/#/c/19871/, and https://review.gluster.org/#/c/19952/ This patch adds version agnostic imports for urllib, cpickle, socketserver, _thread, queue, etc., suggested by Aravinda in https://review.gluster.org/#/c/19767/1 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, and zip have already been applied. Note: these 2to3 fixes report no changes are necessary: 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: I8d393064a1837874d8b4bc87c8ce05c679664642 updates: #411 Signed-off-by: Kaleb S. KEITHLEY --- tools/glusterfind/src/changelog.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/glusterfind/src/changelog.py') diff --git a/tools/glusterfind/src/changelog.py b/tools/glusterfind/src/changelog.py index 608b5c7c2d..5897f790d4 100644 --- a/tools/glusterfind/src/changelog.py +++ b/tools/glusterfind/src/changelog.py @@ -16,7 +16,10 @@ import xattr import logging from argparse import ArgumentParser, RawDescriptionHelpFormatter import hashlib -import urllib.request, urllib.parse, urllib.error +try: + import urllib.parse as urllib +except ImportError: + import urllib import codecs import libgfchangelog -- cgit