Changeset 9ed0cd42 in trunk

Timestamp:

2021-06-03T13:08:13Z (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

aef8705, e2831ee

Parents:

336ca45c (diff), a910ebcc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Itamar Turner-Trauring <itamar@…> (2021-06-03 13:08:13)

git-committer:

GitHub <noreply@…> (2021-06-03 13:08:13)

Message:

Merge pull request #1074 from tahoe-lafs/3728.scripts-python-3-part-3

Port allmydata.scripts to Python 3, part 3

Fixes ticket:3728

Files:

• newsfragments/3728.minor (added)
• src/allmydata/scripts/cli.py (modified) (1 diff)
• src/allmydata/scripts/tahoe_cp.py (modified) (17 diffs)
• src/allmydata/scripts/tahoe_get.py (modified) (1 diff)
• src/allmydata/scripts/tahoe_invite.py (modified) (1 diff)
• src/allmydata/scripts/tahoe_ls.py (modified) (7 diffs)
• src/allmydata/scripts/tahoe_manifest.py (modified) (3 diffs)
• src/allmydata/util/_python3.py (modified) (1 diff)

src/allmydata/scripts/cli.py ¶

@@ -516 +516 @@
 def list_(options):
     from allmydata.scripts import tahoe_ls
-    rc = tahoe_ls.list(options)
+    rc = tahoe_ls.ls(options)
     return rc
 

src/allmydata/scripts/tahoe_cp.py ¶

@@ +1 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
-from past.builtins import unicode
+from future.utils import PY2
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
 
 import os.path
@@ -163 +171 @@
 
     def get_child_target(self, name):
-        precondition(isinstance(name, unicode), name)
+        precondition(isinstance(name, str), name)
         precondition(len(name), name) # don't want ""
         if self.children is None:
@@ -176 +184 @@
 
     def put_file(self, name, inf):
-        precondition(isinstance(name, unicode), name)
+        precondition(isinstance(name, str), name)
         pathname = os.path.join(self.pathname, name)
         fileutil.put_file(pathname, inf)
@@ -259 +267 @@
         assert nodetype == "dirnode"
         self.mutable = d.get("mutable", False) # older nodes don't provide it
-        self.children_d = dict( [(unicode(name),value)
+        self.children_d = dict( [(str(name),value)
                                  for (name,value)
                                  in d["children"].items()] )
@@ -269 +277 @@
         self.readcap = to_bytes(d.get("ro_uri"))
         self.mutable = d.get("mutable", False) # older nodes don't provide it
-        self.children_d = dict( [(unicode(name),value)
+        self.children_d = dict( [(str(name),value)
                                  for (name,value)
                                  in d["children"].items()] )
@@ -339 +347 @@
         self.readcap = to_bytes(d.get("ro_uri"))
         self.mutable = d.get("mutable", False) # older nodes don't provide it
-        self.children_d = dict( [(unicode(name),value)
+        self.children_d = dict( [(str(name),value)
                                  for (name,value)
                                  in d["children"].items()] )
@@ -356 +364 @@
         assert nodetype == "dirnode"
         self.mutable = d.get("mutable", False) # older nodes don't provide it
-        self.children_d = dict( [(unicode(name),value)
+        self.children_d = dict( [(str(name),value)
                                  for (name,value)
                                  in d["children"].items()] )
@@ -412 +420 @@
     def get_child_target(self, name):
         # return a new target for a named subdirectory of this dir
-        precondition(isinstance(name, unicode), name)
+        precondition(isinstance(name, str), name)
         if self.children is None:
             self.populate(recurse=False)
@@ -425 +433 @@
 
     def put_file(self, name, inf):
-        precondition(isinstance(name, unicode), name)
+        precondition(isinstance(name, str), name)
         url = self.nodeurl + "uri"
         if not seekable(inf):
@@ -445 +453 @@
 
     def put_uri(self, name, filecap):
-        precondition(isinstance(name, unicode), name)
+        precondition(isinstance(name, str), name)
         self.new_children[name] = filecap
 
@@ -454 +462 @@
                + "?t=set_children")
         set_data = {}
-        for (name, filecap) in self.new_children.items():
+        for (name, filecap) in list(self.new_children.items()):
             # it just so happens that ?t=set_children will accept both file
             # read-caps and write-caps as ['rw_uri'], and will handle either
@@ -598 +606 @@
 
     def get_target_info(self, destination_spec):
-        precondition(isinstance(destination_spec, unicode), destination_spec)
+        precondition(isinstance(destination_spec, str), destination_spec)
         rootcap, path_utf8 = get_alias(self.aliases, destination_spec, None)
         path = path_utf8.decode("utf-8")
@@ -645 +653 @@
         This turns an argv string into a (Local|Tahoe)(File|Directory)Source.
         """
-        precondition(isinstance(source_spec, unicode), source_spec)
+        precondition(isinstance(source_spec, str), source_spec)
         rootcap, path_utf8 = get_alias(self.aliases, source_spec, None)
         path = path_utf8.decode("utf-8")
@@ -753 +761 @@
         # target name collisions are an error
         collisions = []
-        for target, sources in targetmap.items():
+        for target, sources in list(targetmap.items()):
             target_names = {}
             for source in sources:
@@ -822 +830 @@
         # copy everything in the source into the target
         precondition(isinstance(source, DirectorySources), source)
-        for name, child in source.children.items():
+        for name, child in list(source.children.items()):
             if isinstance(child, DirectorySources):
                 # we will need a target directory for this one
@@ -838 +846 @@
         targets_finished = 0
 
-        for target, sources in targetmap.items():
+        for target, sources in list(targetmap.items()):
             _assert(isinstance(target, DirectoryTargets), target)
             for source in sources:
@@ -858 +866 @@
         precondition(isinstance(source, FileSources), source)
         precondition(isinstance(target, DirectoryTargets), target)
-        precondition(isinstance(name, unicode), name)
+        precondition(isinstance(name, str), name)
         if self.need_to_copy_bytes(source, target):
             # if the target is a local directory, this will just write the

src/allmydata/scripts/tahoe_get.py ¶

@@ +1 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
-from future.utils import PY3
+from future.utils import PY2, PY3
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
 
 from urllib.parse import quote as url_quote

src/allmydata/scripts/tahoe_invite.py ¶

@@ +1 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
+from future.utils import PY2
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
 
 try:

src/allmydata/scripts/tahoe_ls.py ¶

@@ +1 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
-from past.builtins import unicode
-from six import ensure_text, ensure_str
+from future.utils import PY2
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+
+from six import ensure_text
 
 import time
@@ -12 +21 @@
 from allmydata.util.encodingutil import unicode_to_output, quote_output, is_printable_ascii, to_bytes
 
-def list(options):
+def ls(options):
     nodeurl = options['node-url']
     aliases = options.aliases
@@ -29 +38 @@
         return 1
 
-    path = unicode(path, "utf-8")
+    path = str(path, "utf-8")
     url = nodeurl + "uri/%s" % url_quote(rootcap)
     if path:
@@ -51 +60 @@
         # The webapi server should always output printable ASCII.
         if is_printable_ascii(data):
-            data = unicode(data, "ascii")
+            data = str(data, "ascii")
             print(data, file=stdout)
             return 0
@@ -88 +97 @@
     for name in childnames:
         child = children[name]
-        name = unicode(name)
+        name = str(name)
         childtype = child[0]
 
@@ -148 +157 @@
             classify = ""
 
-        encoding_error = False
-        try:
-            line.append(unicode_to_output(name) + classify)
-        except UnicodeEncodeError:
-            encoding_error = True
-            line.append(quote_output(name) + classify)
+        line.append(name + classify)
 
         if options["uri"]:
-            line.append(ensure_str(uri))
+            line.append(ensure_text(uri))
         if options["readonly-uri"]:
-            line.append(quote_output(ensure_str(ro_uri) or "-", quotemarks=False))
-
-        rows.append((encoding_error, line))
+            line.append(quote_output(ensure_text(ro_uri) or "-", quotemarks=False))
+
+        rows.append(line)
 
     max_widths = []
     left_justifys = []
-    for (encoding_error, row) in rows:
+    for row in rows:
         for i,cell in enumerate(row):
             while len(max_widths) <= i:
@@ -186 +190 @@
 
     rc = 0
-    for (encoding_error, row) in rows:
+    for row in rows:
+        row = (fmt % tuple(row)).rstrip()
+        encoding_error = False
+        try:
+            row = unicode_to_output(row)
+        except UnicodeEncodeError:
+            encoding_error = True
+            row = quote_output(row)
         if encoding_error:
-            print((fmt % tuple(row)).rstrip(), file=stderr)
+            print(row, file=stderr)
             rc = 1
         else:
-            print((fmt % tuple(row)).rstrip(), file=stdout)
+            print(row, file=stdout)
 
     if rc == 1:

src/allmydata/scripts/tahoe_manifest.py ¶

@@ +1 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import unicode_literals
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
-from future.utils import PY3
-from past.builtins import unicode
+from future.utils import PY2, PY3
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+
+from six import ensure_str
 
 from urllib.parse import quote as url_quote
@@ -38 +47 @@
             e.display(stderr)
             return 1
-        path = unicode(path, "utf-8")
+        path = str(path, "utf-8")
         if path == '/':
             path = ''
@@ -97 +106 @@
                         print(quote_output(vc, quotemarks=False), file=stdout)
                 else:
-                    print("%s %s" % (quote_output(d["cap"], quotemarks=False),
-                                               quote_path(d["path"], quotemarks=False)), file=stdout)
+                    # ensure_str() only necessary for Python 2.
+                    print(ensure_str("%s %s") % (
+                        quote_output(d["cap"], quotemarks=False),
+                        quote_path(d["path"], quotemarks=False)), file=stdout)
 
 def manifest(options):

src/allmydata/util/_python3.py ¶

@@ -106 +106 @@
     "allmydata.scripts.tahoe_backup",
     "allmydata.scripts.tahoe_check",
+    "allmydata.scripts.tahoe_cp",
+    "allmydata.scripts.tahoe_get",
+    "allmydata.scripts.tahoe_invite",
+    "allmydata.scripts.tahoe_ls",
+    "allmydata.scripts.tahoe_manifest",
     "allmydata.scripts.types_",
     "allmydata.stats",