Merge pull request #1006 from tahoe-lafs/3640.tor-i2p-tests-python-3

Port tor and i2p provider modules to Python 3

Fixes ticket:3640

src/allmydata/test/test_connections.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
 
 from twisted.trial import unittest
 from twisted.internet import reactor

src/allmydata/test/test_i2p_provider.py

@@ -1,3 +1,15 @@
+"""
+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
 from twisted.trial import unittest
 from twisted.internet import defer, error

src/allmydata/test/test_tor_provider.py

@@ -1,3 +1,15 @@
+"""
+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
 from twisted.trial import unittest
 from twisted.internet import defer, error
@@ -173,7 +185,7 @@ class CreateOnion(unittest.TestCase):
                                                            protocol)))
         txtorcon = mock.Mock()
         ehs = mock.Mock()
-        ehs.private_key = "privkey"
+        ehs.private_key = b"privkey"
         ehs.hostname = "ONION.onion"
         txtorcon.EphemeralHiddenService = mock.Mock(return_value=ehs)
         ehs.add_to_tor = mock.Mock(return_value=defer.succeed(None))
@@ -208,7 +220,7 @@ class CreateOnion(unittest.TestCase):
         fn = os.path.join(basedir, tahoe_config_tor["onion.private_key_file"])
         with open(fn, "rb") as f:
             privkey = f.read()
-        self.assertEqual(privkey, "privkey")
+        self.assertEqual(privkey, b"privkey")
 
     def test_launch(self):
         return self._do_test_launch(None)
@@ -227,7 +239,7 @@ class CreateOnion(unittest.TestCase):
                                                                protocol)))
         txtorcon = mock.Mock()
         ehs = mock.Mock()
-        ehs.private_key = "privkey"
+        ehs.private_key = b"privkey"
         ehs.hostname = "ONION.onion"
         txtorcon.EphemeralHiddenService = mock.Mock(return_value=ehs)
         ehs.add_to_tor = mock.Mock(return_value=defer.succeed(None))
@@ -259,7 +271,7 @@ class CreateOnion(unittest.TestCase):
         fn = os.path.join(basedir, tahoe_config_tor["onion.private_key_file"])
         with open(fn, "rb") as f:
             privkey = f.read()
-        self.assertEqual(privkey, "privkey")
+        self.assertEqual(privkey, b"privkey")
 
 
 _None = object()
@@ -590,7 +602,7 @@ class Provider_Service(unittest.TestCase):
         launch_tor.assert_called_with(reactor, None,
                                       os.path.join(basedir, "private"), txtorcon)
         txtorcon.EphemeralHiddenService.assert_called_with("456 127.0.0.1:123",
-                                                           "private key")
+                                                           b"private key")
         ehs.add_to_tor.assert_called_with(tor_state.protocol)
 
         yield p.stopService()
@@ -632,7 +644,7 @@ class Provider_Service(unittest.TestCase):
         cfs.assert_called_with(reactor, "ep_desc")
         txtorcon.build_tor_connection.assert_called_with(tcep)
         txtorcon.EphemeralHiddenService.assert_called_with("456 127.0.0.1:123",
-                                                           "private key")
+                                                           b"private key")
         ehs.add_to_tor.assert_called_with(tor_state.protocol)
 
         yield p.stopService()

src/allmydata/util/_python3.py

@@ -110,6 +110,7 @@ PORTED_MODULES = [
     "allmydata.util.happinessutil",
     "allmydata.util.hashutil",
     "allmydata.util.humanreadable",
+    "allmydata.util.i2p_provider",
     "allmydata.util.idlib",
     "allmydata.util.iputil",
     "allmydata.util.jsonbytes",
@@ -123,6 +124,7 @@ PORTED_MODULES = [
     "allmydata.util.spans",
     "allmydata.util.statistics",
     "allmydata.util.time_format",
+    "allmydata.util.tor_provider",
     "allmydata.web.check_results",
     "allmydata.web.common",
     "allmydata.web.directory",
@@ -169,6 +171,7 @@ PORTED_TEST_MODULES = [
     "allmydata.test.test_codec",
     "allmydata.test.test_common_util",
     "allmydata.test.test_configutil",
+    "allmydata.test.test_connections",
     "allmydata.test.test_connection_status",
     "allmydata.test.test_crawler",
     "allmydata.test.test_crypto",
@@ -191,6 +194,7 @@ PORTED_TEST_MODULES = [
     "allmydata.test.test_helper",
     "allmydata.test.test_humanreadable",
     "allmydata.test.test_hung_server",
+    "allmydata.test.test_i2p_provider",
     "allmydata.test.test_immutable",
     "allmydata.test.test_introducer",
     "allmydata.test.test_iputil",
@@ -220,6 +224,7 @@ PORTED_TEST_MODULES = [
 
     "allmydata.test.test_testing",
     "allmydata.test.test_time_format",
+    "allmydata.test.test_tor_provider",
     "allmydata.test.test_upload",
     "allmydata.test.test_uri",
     "allmydata.test.test_util",

src/allmydata/util/i2p_provider.py

@@ -1,5 +1,15 @@
 # -*- coding: utf-8 -*-
+"""
+Ported to Python 3.
+"""
 from __future__ import absolute_import, print_function, with_statement
+from __future__ import division
+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
 
 from zope.interface import (

src/allmydata/util/tor_provider.py

@@ -1,5 +1,15 @@
 # -*- coding: utf-8 -*-
+"""
+Ported to Python 3.
+"""
 from __future__ import absolute_import, print_function, with_statement
+from __future__ import division
+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
 
 from zope.interface import (