Changeset 55623d0 in trunk

Timestamp:

2020-11-06T16:27:59Z (5 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

2e6f8ca

Parents:

dfdaac7

Message:

Ported to Python 3.

Location:

src/allmydata

Files:

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

src/allmydata/test/mutable/test_multiple_versions.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
+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 twisted.trial import unittest
 from allmydata.monitor import Monitor
@@ -37 +49 @@
             newer = smap.unrecoverable_newer_versions()
             self.failUnlessEqual(len(newer), 1)
-            verinfo, health = newer.items()[0]
+            verinfo, health = list(newer.items())[0]
             self.failUnlessEqual(verinfo[0], 4)
             self.failUnlessEqual(health, (1,3))
@@ -71 +83 @@
 
         def _modify(oldversion, servermap, first_time):
-            return oldversion + " modified"
+            return oldversion + b" modified"
         d = self._fn.modify(_modify)
         d.addCallback(lambda res: self._fn.download_best_version())
-        expected = self.CONTENTS[2] + " modified"
+        expected = self.CONTENTS[2] + b" modified"
         d.addCallback(lambda res: self.failUnlessEqual(res, expected))
         # and the servermap should indicate that the outlier was replaced too

src/allmydata/util/_python3.py ¶

@@ -103 +103 @@
     "allmydata.test.mutable.test_filenode",
     "allmydata.test.mutable.test_interoperability",
+    "allmydata.test.mutable.test_multiple_versions",
     "allmydata.test.test_abbreviate",
     "allmydata.test.test_base32",