py3 fixes

marcelotduarte · djc · commit 31c64f3fe450 · 2016-10-05T20:12:53.000+02:00
diff --git a/couchdb/tools/load.py b/couchdb/tools/load.py
@@ -11,6 +11,7 @@
 file.
 """
 
+from __future__ import print_function
 from base64 import b64encode
 from optparse import OptionParser
 import sys
@@ -36,7 +37,7 @@ def load_db(fileobj, dburl, username=None, password=None, ignore_errors=False):
                     doc['_attachments'] = {}
                 else:
                     doc['_attachments'][headers['content-id']] = {
-                        'data': b64encode(payload),
+                        'data': b64encode(payload).decode('ascii'),
                         'content_type': headers['content-type'],
                         'length': len(payload)
                     }
@@ -45,13 +46,13 @@ def load_db(fileobj, dburl, username=None, password=None, ignore_errors=False):
             doc = json.decode(payload)
 
         del doc['_rev']
-        print>>sys.stderr, 'Loading document %r' % docid
+        print('Loading document %r' % docid, file=sys.stderr)
         try:
             db[docid] = doc
         except Exception as e:
             if not ignore_errors:
                 raise
-            print>>sys.stderr, 'Error: %s' % e
+            print('Error: %s' % e, file=sys.stderr)
 
 
 def main():
