From bc61ee44a3f8a9bf0490605f62ec27fcd6a5b8d0 Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Wed, 22 Aug 2018 02:05:59 -0400 Subject: glusterfind: Fix problems in python2 -> python3 compat 1. Import configparser module correctly 2. Fix issues with urllib usage Updates: #411 Change-Id: I060af29f1ebac3a5e2aeeee2720b7372d4c31697 Signed-off-by: Kotresh HR --- tools/glusterfind/src/brickfind.py | 2 +- tools/glusterfind/src/changelog.py | 4 ++-- tools/glusterfind/src/conf.py | 4 ++-- tools/glusterfind/src/nodeagent.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tools/glusterfind') diff --git a/tools/glusterfind/src/brickfind.py b/tools/glusterfind/src/brickfind.py index 6bfb997f5a0..7745635970b 100644 --- a/tools/glusterfind/src/brickfind.py +++ b/tools/glusterfind/src/brickfind.py @@ -87,7 +87,7 @@ if __name__ == "__main__": args = _get_args() session_dir = os.path.join(conf.get_opt("session_dir"), args.session) status_file = os.path.join(session_dir, args.volume, - "%s.status" % urllib.parse.quote_plus(args.brick)) + "%s.status" % urllib.quote_plus(args.brick)) status_file_pre = status_file + ".pre" mkdirp(os.path.join(session_dir, args.volume), exit_on_err=True, logger=logger) diff --git a/tools/glusterfind/src/changelog.py b/tools/glusterfind/src/changelog.py index 5897f790d4b..3c8df401c45 100644 --- a/tools/glusterfind/src/changelog.py +++ b/tools/glusterfind/src/changelog.py @@ -246,7 +246,7 @@ def get_changes(brick, hash_dir, log_file, start, end, args): session_dir = os.path.join(conf.get_opt("session_dir"), args.session) status_file = os.path.join(session_dir, args.volume, - "%s.status" % urllib.parse.quote_plus(args.brick)) + "%s.status" % urllib.quote_plus(args.brick)) # Get previous session try: @@ -383,7 +383,7 @@ if __name__ == "__main__": session_dir = os.path.join(conf.get_opt("session_dir"), args.session) status_file = os.path.join(session_dir, args.volume, - "%s.status" % urllib.parse.quote_plus(args.brick)) + "%s.status" % urllib.quote_plus(args.brick)) status_file_pre = status_file + ".pre" mkdirp(os.path.join(session_dir, args.volume), exit_on_err=True, logger=logger) diff --git a/tools/glusterfind/src/conf.py b/tools/glusterfind/src/conf.py index fdab38badb1..81183d55444 100644 --- a/tools/glusterfind/src/conf.py +++ b/tools/glusterfind/src/conf.py @@ -10,9 +10,9 @@ import os try: - import configparser + import configparser as ConfigParser except ImportError: - import ConfigParser as configparser + import ConfigParser config = ConfigParser.ConfigParser() config.read(os.path.join(os.path.dirname(os.path.abspath(__file__)), diff --git a/tools/glusterfind/src/nodeagent.py b/tools/glusterfind/src/nodeagent.py index 4aed0e2ad96..c2996da78b5 100644 --- a/tools/glusterfind/src/nodeagent.py +++ b/tools/glusterfind/src/nodeagent.py @@ -52,7 +52,7 @@ def mode_create(args): session_dir = os.path.join(conf.get_opt("session_dir"), args.session) status_file = os.path.join(session_dir, args.volume, - "%s.status" % urllib.parse.quote_plus(args.brick)) + "%s.status" % urllib.quote_plus(args.brick)) mkdirp(os.path.join(session_dir, args.volume), exit_on_err=True, logger=logger) @@ -67,7 +67,7 @@ def mode_create(args): def mode_post(args): session_dir = os.path.join(conf.get_opt("session_dir"), args.session) status_file = os.path.join(session_dir, args.volume, - "%s.status" % urllib.parse.quote_plus(args.brick)) + "%s.status" % urllib.quote_plus(args.brick)) mkdirp(os.path.join(session_dir, args.volume), exit_on_err=True, logger=logger) -- cgit