Merge "Use stdlib urlparse"

bin/swauth-add-account

@@ -20,8 +20,8 @@ from optparse import OptionParser
 from sys import argv
 from sys import exit
 
+from six.moves.urllib.parse import urlparse
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':

bin/swauth-add-user

@@ -20,8 +20,8 @@ from optparse import OptionParser
 from sys import argv
 from sys import exit
 
+from six.moves.urllib.parse import urlparse
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':

bin/swauth-cleanup-tokens

@@ -99,7 +99,7 @@ if __name__ == '__main__':
         if options.verbose:
             print('Done.')
         exit(0)
-    for x in xrange(16):
+    for x in range(16):
         container = '.token_%x' % x
         marker = None
         while True:
@@ -132,7 +132,7 @@ if __name__ == '__main__':
                         if err.http_status != 404:
                             raise
                     continue
-                last_modified = datetime(*map(int, re.split('[^\d]',
+                last_modified = datetime(*map(int, re.split(r'[^\d]',
                                               obj['last_modified'])[:-1]))
                 ago = datetime.utcnow() - last_modified
                 if ago > options.token_life:

bin/swauth-delete-account

@@ -20,8 +20,8 @@ from optparse import OptionParser
 from sys import argv
 from sys import exit
 
+from six.moves.urllib.parse import urlparse
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':

bin/swauth-delete-user

@@ -20,8 +20,8 @@ from optparse import OptionParser
 from sys import argv
 from sys import exit
 
+from six.moves.urllib.parse import urlparse
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':

bin/swauth-list

@@ -21,8 +21,8 @@ from optparse import OptionParser
 from sys import argv
 from sys import exit
 
+from six.moves.urllib.parse import urlparse
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':

bin/swauth-prep

@@ -20,8 +20,8 @@ from optparse import OptionParser
 from sys import argv
 from sys import exit
 
+from six.moves.urllib.parse import urlparse
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':

bin/swauth-set-account-service

@@ -21,8 +21,8 @@ from optparse import OptionParser
 from sys import argv
 from sys import exit
 
+from six.moves.urllib.parse import urlparse
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swift.common.utils import urlparse
 
 
 if __name__ == '__main__':

swauth/middleware.py

@@ -21,6 +21,7 @@ from httplib import HTTPConnection
 from httplib import HTTPSConnection
 import json
 import six
+from six.moves.urllib.parse import urlparse
 import swift
 from time import gmtime
 from time import strftime
@@ -56,7 +57,6 @@ from swift.common.utils import HASH_PATH_PREFIX
 from swift.common.utils import HASH_PATH_SUFFIX
 from swift.common.utils import split_path
 from swift.common.utils import TRUE_VALUES
-from swift.common.utils import urlparse
 import swift.common.wsgi
 
 import swauth.authtypes