Changeset 40b4244 in trunk

Timestamp:

2020-09-21T17:21:19Z (4 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

5fbbb5b

Parents:

6fe68c7

git-author:

Itamar Turner-Trauring <itamar@…> (2020-09-21 17:13:26)

git-committer:

Itamar Turner-Trauring <itamar@…> (2020-09-21 17:21:19)

Message:

Port to Python 3.

Location:

src/allmydata

Files:

• test/test_upload.py (modified) (4 diffs)
• util/_python3.py (modified) (1 diff)

src/allmydata/test/test_upload.py ¶

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+
+"""
+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
 
 import os, shutil
@@ -111 +123 @@
                 b"maximum-immutable-share-size": 2**32 - 1,
             },
-            b"application-version": str(allmydata.__full_version__),
+            b"application-version": bytes(allmydata.__full_version__, "ascii"),
         }
         if mode == "small":
@@ -119 +131 @@
                     b"maximum-immutable-share-size": 10,
                 },
-                b"application-version": str(allmydata.__full_version__),
+                b"application-version": bytes(allmydata.__full_version__, "ascii"),
             }
 
@@ -216 +228 @@
         self.num_servers = num_servers
         self.encoding_params = self.DEFAULT_ENCODING_PARAMETERS.copy()
-        if type(mode) is str:
+        if isinstance(mode, str):
             mode = dict([i,mode] for i in range(num_servers))
         servers = [

src/allmydata/util/_python3.py ¶

@@ -105 +105 @@
     "allmydata.test.test_storage_web",
     "allmydata.test.test_time_format",
+    "allmydata.test.test_upload",
     "allmydata.test.test_uri",
     "allmydata.test.test_util",