Merge pull request #853 from tahoe-lafs/3346.port-immutable-offloaded

Port immutable.offloaded to Python 3

src/allmydata/immutable/offloaded.py

@@ -1,3 +1,14 @@
+"""
+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
 
 import os, stat, time, weakref
 from zope.interface import implementer
@@ -128,9 +139,9 @@ class CHKUploadHelper(Referenceable, upload.CHKUploader):
     peer selection, encoding, and share pushing. I read ciphertext from the
     remote AssistedUploader.
     """
-    VERSION = { "http://allmydata.org/tahoe/protocols/helper/chk-upload/v1" :
+    VERSION = { b"http://allmydata.org/tahoe/protocols/helper/chk-upload/v1" :
                  { },
-                "application-version": str(allmydata.__full_version__),
+                b"application-version": allmydata.__full_version__.encode("utf-8"),
                 }
 
     def __init__(self, storage_index,

src/allmydata/test/test_helper.py

@@ -1,3 +1,6 @@
+"""
+Ported to Python 3.
+"""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function

src/allmydata/util/_python3.py

@@ -46,6 +46,7 @@ PORTED_MODULES = [
     "allmydata.immutable.happiness_upload",
     "allmydata.immutable.layout",
     "allmydata.immutable.literal",
+    "allmydata.immutable.offloaded",
     "allmydata.immutable.upload",
     "allmydata.interfaces",
     "allmydata.introducer.interfaces",