Merge remote-tracking branch 'origin/master' into 3451.immutable-downloader-start-python-3

src/allmydata/immutable/literal.py

@@ -1,8 +1,20 @@
+"""
+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 io import BytesIO
 
 from zope.interface import implementer
 from twisted.internet import defer
-from twisted.internet.interfaces import IPushProducer
 from twisted.protocols import basic
 from allmydata.interfaces import IImmutableFileNode, ICheckable
 from allmydata.uri import LiteralFileURI
@@ -33,29 +45,15 @@ class _ImmutableFileNodeBase(object):
 
     def __hash__(self):
         return self.u.__hash__()
+
     def __eq__(self, other):
         if isinstance(other, _ImmutableFileNodeBase):
-            return self.u.__eq__(other.u)
+            return self.u == other.u
         else:
             return False
+
     def __ne__(self, other):
-        if isinstance(other, _ImmutableFileNodeBase):
-            return self.u.__eq__(other.u)
-        else:
-            return True
-
-
-@implementer(IPushProducer)
-class LiteralProducer(object):
-
-    def pauseProducing(self):
-        pass
-
-    def resumeProducing(self):
-        pass
-
-    def stopProducing(self):
-        pass
+        return not self == other
 
 
 class LiteralFileNode(_ImmutableFileNodeBase):

src/allmydata/introducer/interfaces.py

@@ -1,3 +1,16 @@
+"""
+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, native_str
+if PY2:
+    # Omitted types (bytes etc.) so future variants don't confuse Foolscap.
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, object, range, max, min  # noqa: F401
 
 from zope.interface import Interface
 from foolscap.api import StringConstraint, SetOf, DictOf, Any, \
@@ -11,8 +24,8 @@ FURL = StringConstraint(1000)
 #     "app-versions", "my-version", "oldest-supported", and "service-name".
 #     Plus service-specific keys like "anonymous-storage-FURL" and
 #     "permutation-seed-base32" (both for service="storage").
-# * sig_vs (str): "v0-"+base32(signature(msg))
-# * claimed_key_vs (str): "v0-"+base32(pubkey)
+# * sig_vs (bytes): "v0-"+base32(signature(msg))
+# * claimed_key_vs (bytes): "v0-"+base32(pubkey)
 
 # (nickname, my_version, oldest_supported) refer to the client as a whole.
 # The my_version/oldest_supported strings can be parsed by an
@@ -28,26 +41,26 @@ FURL = StringConstraint(1000)
 Announcement_v2 = Any()
 
 class RIIntroducerSubscriberClient_v2(RemoteInterface):
-    __remote_name__ = "RIIntroducerSubscriberClient_v2.tahoe.allmydata.com"
+    __remote_name__ = native_str("RIIntroducerSubscriberClient_v2.tahoe.allmydata.com")
 
     def announce_v2(announcements=SetOf(Announcement_v2)):
         """I accept announcements from the publisher."""
         return None
 
-SubscriberInfo = DictOf(str, Any())
+SubscriberInfo = DictOf(bytes, Any())
 
 class RIIntroducerPublisherAndSubscriberService_v2(RemoteInterface):
     """To publish a service to the world, connect to me and give me your
     announcement message. I will deliver a copy to all connected subscribers.
     To hear about services, connect to me and subscribe to a specific
     service_name."""
-    __remote_name__ = "RIIntroducerPublisherAndSubscriberService_v2.tahoe.allmydata.com"
+    __remote_name__ = native_str("RIIntroducerPublisherAndSubscriberService_v2.tahoe.allmydata.com")
     def get_version():
-        return DictOf(str, Any())
+        return DictOf(bytes, Any())
     def publish_v2(announcement=Announcement_v2, canary=Referenceable):
         return None
     def subscribe_v2(subscriber=RIIntroducerSubscriberClient_v2,
-                     service_name=str, subscriber_info=SubscriberInfo):
+                     service_name=bytes, subscriber_info=SubscriberInfo):
         """Give me a subscriber reference, and I will call its announce_v2()
         method with any announcements that match the desired service name. I
         will ignore duplicate subscriptions. The subscriber_info dictionary
@@ -93,11 +106,16 @@ class IIntroducerClient(Interface):
          version: 0
          nickname: unicode
          app-versions: {}
-         my-version: str
-         oldest-supported: str
+         my-version: bytes
+         oldest-supported: bytes
 
-         service-name: str('storage')
-         anonymous-storage-FURL: str(furl)
+         service-name: bytes('storage')
+         anonymous-storage-FURL: bytes(furl)
+
+        In order to be JSON-serializable, all byte strings are assumed to be
+        ASCII-encoded, and the receiver can therefore decode them into Unicode
+        strings if they wish. Representation of these fields elsewhere in Tahoe
+        may differ, e.g. by being unicode strings.
 
         Note that app-version will be an empty dictionary if either the
         publishing client or the Introducer are running older code.

src/allmydata/test/storage_plugin.py

@@ -3,6 +3,8 @@ A storage server plugin the test suite can use to validate the
 functionality.
 """
 
+from future.utils import native_str
+
 from json import (
     dumps,
 )
@@ -36,7 +38,7 @@ from allmydata.client import (
 
 
 class RIDummy(RemoteInterface):
-    __remote_name__ = "RIDummy.tahoe.allmydata.com"
+    __remote_name__ = native_str("RIDummy.tahoe.allmydata.com")
 
     def just_some_method():
         """

src/allmydata/test/test_immutable.py

@@ -26,6 +26,7 @@ from allmydata.util.consumer import download_to_data
 from allmydata.interfaces import NotEnoughSharesError
 from allmydata.immutable.upload import Data
 from allmydata.immutable.downloader import finder
+from allmydata.immutable.literal import LiteralFileNode
 
 from .no_network import (
     NoNetworkServer,
@@ -340,6 +341,24 @@ class Test(GridTestMixin, unittest.TestCase, common.ShouldFailMixin):
         return d
 
 
+class LiteralFileNodeTests(unittest.TestCase):
+    """Tests for LiteralFileNode."""
+
+    def test_equality(self):
+        """LiteralFileNodes are equal iff they have the same URI."""
+        uri1 = uri.LiteralFileURI(b"1")
+        uri2 = uri.LiteralFileURI(b"2")
+        lfn1 = LiteralFileNode(uri1)
+        lfn1b = LiteralFileNode(uri1)
+        lfn2 = LiteralFileNode(uri2)
+        self.assertTrue(lfn1 == lfn1b)
+        self.assertFalse(lfn1 != lfn1b)
+        self.assertTrue(lfn1 != lfn2)
+        self.assertFalse(lfn1 == lfn2)
+        self.assertTrue(lfn1 != 300)
+        self.assertFalse(lfn1 == 300)
+
+
 # XXX extend these tests to show bad behavior of various kinds from servers:
 # raising exception from each remove_foo() method, for example
 

src/allmydata/util/_python3.py

@@ -32,11 +32,13 @@ PORTED_MODULES = [
     "allmydata.crypto.rsa",
     "allmydata.crypto.util",
     "allmydata.hashtree",
-    "allmydata.immutable.happiness_upload",
     "allmydata.immutable.downloader.fetcher",
     "allmydata.immutable.downloader.finder",
     "allmydata.immutable.downloader.segmentation",
+    "allmydata.immutable.happiness_upload",
+    "allmydata.immutable.literal",
     "allmydata.interfaces",
+    "allmydata.introducer.interfaces",
     "allmydata.monitor",
     "allmydata.storage.common",
     "allmydata.storage.crawler",