Changeset a29c03d in trunk

Timestamp:

2021-03-04T16:02:36Z (4 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

f2970f1

Parents:

cf418b7

Message:

Port to Python 3.

Location:

src/allmydata

Files:

• test/test_client.py (modified) (3 diffs)
• util/_python3.py (modified) (1 diff)

src/allmydata/test/test_client.py ¶

@@ +1 @@
+"""
+Ported to Python 3.
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
 from future.utils import PY2
-from past.builtins import unicode
+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, sys
@@ -190 +199 @@
             "client.port",
         )
-        abs_basedir = fileutil.abspath_expanduser_unicode(unicode(basedir))
+        abs_basedir = fileutil.abspath_expanduser_unicode(str(basedir))
         self.failUnlessIn(os.path.join(abs_basedir, "introducer.furl"), e.args[0])
         self.failUnlessIn(os.path.join(abs_basedir, "no_storage"), e.args[0])
@@ -435 +444 @@
         generic helper for following storage_dir tests
         """
-        assert isinstance(basedir, unicode)
-        assert isinstance(storage_path, (unicode, type(None)))
-        assert isinstance(expected_path, unicode)
+        assert isinstance(basedir, str)
+        assert isinstance(storage_path, (str, type(None)))
+        assert isinstance(expected_path, str)
         os.mkdir(basedir)
         cfg_path = os.path.join(basedir, "tahoe.cfg")

src/allmydata/util/_python3.py ¶

@@ -152 +152 @@
     "allmydata.test.test_base62",
     "allmydata.test.test_checker",
+    "allmydata.test.test_client",
     "allmydata.test.test_codec",
     "allmydata.test.test_common_util",