Get replicate script working on Python 3

djc · djc · commit 145dc9bf0843 · 2014-07-07T11:49:27.000+02:00
diff --git a/couchdb/tools/replicate.py b/couchdb/tools/replicate.py
@@ -21,7 +21,6 @@
 import optparse
 import sys
 import time
-import urlparse
 import fnmatch
 
 def findpath(parser, s):
@@ -32,7 +31,7 @@ def findpath(parser, s):
     if not s.startswith('http'):
         return client.DEFAULT_BASE_URL, s
 
-    bits = urlparse.urlparse(s)
+    bits = util.urlparse(s)
     res = http.Resource('%s://%s/' % (bits.scheme, bits.netloc), None)
     parts = bits.path.split('/')[1:]
     if parts and not parts[-1]:
@@ -98,25 +97,25 @@ def main():
     for sdb, tdb in databases:
 
         start = time.time()
-        print sdb, '->', tdb,
+        print(sdb, '->', tdb)
         sys.stdout.flush()
 
         if tdb not in target:
             target.create(tdb)
-            print "created",
+            sys.stdout.write("created")
             sys.stdout.flush()
 
         sdb = '%s%s' % (sbase, util.urlquote(sdb, ''))
         if options.continuous:
             target.replicate(sdb, tdb, continuous=options.continuous)
         else:
             target.replicate(sdb, tdb)
-        print '%.1fs' % (time.time() - start)
+        print('%.1fs' % (time.time() - start))
         sys.stdout.flush()
 
     if options.compact:
         for (sdb, tdb) in databases:
-            print 'compact', tdb
+            print('compact', tdb)
             target[tdb].compact()
 
 if __name__ == '__main__':
diff --git a/couchdb/util2.py b/couchdb/util2.py
@@ -2,14 +2,15 @@
 __all__ = [
     'StringIO', 'urlsplit', 'urlunsplit', 'urlquote', 'urlunquote',
     'urlencode', 'utype', 'ltype', 'pyexec', 'strbase', 'funcode',
+    'urlparse',
 ]
 
 utype = unicode
 ltype = long
 strbase = str, bytes, unicode
 
 from io import BytesIO as StringIO
-from urlparse import urlsplit, urlunsplit
+from urlparse import urlparse, urlsplit, urlunsplit
 from urllib import quote as urlquote
 from urllib import unquote as urlunquote
 from urllib import urlencode
diff --git a/couchdb/util3.py b/couchdb/util3.py
@@ -2,14 +2,15 @@
 __all__ = [
     'StringIO', 'urlsplit', 'urlunsplit', 'urlquote', 'urlunquote',
     'urlencode', 'utype', 'ltype', 'pyexec', 'strbase', 'funcode',
+    'urlparse',
 ]
 
 utype = str
 ltype = int
 strbase = str, bytes
 
 from io import BytesIO as StringIO
-from urllib.parse import urlsplit, urlunsplit, urlencode
+from urllib.parse import urlsplit, urlunsplit, urlencode, urlparse
 from urllib.parse import quote as urlquote
 from urllib.parse import unquote as urlunquote
 
