Merge "Python3: Fix Remaining issues of python3 compatibility in bin directory"

bin/swift-dispersion-populate

@@ -15,14 +15,15 @@
 # limitations under the License.
 
 import traceback
-from ConfigParser import ConfigParser
 from optparse import OptionParser
 from sys import exit, stdout
 from time import time
-from six.moves import range
+
 from eventlet import GreenPool, patcher, sleep
 from eventlet.pools import Pool
+from six.moves import range
 from six.moves import cStringIO as StringIO
+from six.moves.configparser import ConfigParser
 
 try:
     from swiftclient import get_auth

bin/swift-dispersion-report

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 from collections import defaultdict
-from ConfigParser import ConfigParser
+from six.moves.configparser import ConfigParser
 from optparse import OptionParser
 from sys import exit, stdout, stderr
 from time import time

bin/swift-drive-audit

@@ -20,7 +20,9 @@ import os
 import re
 import subprocess
 import sys
-from ConfigParser import ConfigParser
+
+
+from six.moves.configparser import ConfigParser
 
 from swift.common.utils import backward, get_logger, dump_recon_cache, \
     config_true_value

bin/swift-recon-cron

@@ -18,8 +18,9 @@ swift-recon-cron.py
 
 import os
 import sys
-from ConfigParser import ConfigParser
+
 from gettext import gettext as _
+from six.moves.configparser import ConfigParser
 
 from swift.common.utils import get_logger, dump_recon_cache
 from swift.obj.diskfile import ASYNCDIR_BASE

bin/swift-temp-url

@@ -17,7 +17,8 @@ from hashlib import sha1
 from os.path import basename
 from sys import argv, exit, stderr
 from time import time
-import urllib
+
+from six.moves import urllib
 
 
 if __name__ == '__main__':
@@ -66,7 +67,7 @@ if __name__ == '__main__':
         stderr.write(
             'WARNING: Non-object paths will be rejected by tempurl.\n')
     if '--quoted' in argv[5:]:
-        real_path = urllib.unquote(path)
+        real_path = urllib.parse.unquote(path)
     else:
         real_path = path
     sig = hmac.new(key, '%s\n%s\n%s' % (method, expires, real_path),