tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[stem/master] Caching hash values
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit efe5fbdd56b28b3f76de144e71901c0c75ebe5ac Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 20:14:59 2013 -0700 Caching hash values Well, even if we can't use @lru_cache we can still do it the old fashioned way. :P --- stem/exit_policy.py | 40 ++++++++++++++++++++++++---------------- stem/version.py | 18 +++++++++++------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 9c60bda..163f58b 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -502,6 +502,7 @@ class ExitPolicyRule(object): self._address_type = None self._masked_bits = None self.min_port = self.max_port = None + self._hash = None # Our mask in ip notation (ex. "255.255.255.0"). This is only set if we # either have a custom mask that can't be represented by a number of bits, @@ -697,20 +698,23 @@ class ExitPolicyRule(object): return label def __hash__(self): - my_hash = 0 + if self._hash is None: + my_hash = 0 - for attr in ("is_accept", "address", "min_port", "max_port"): - my_hash *= 1024 + for attr in ("is_accept", "address", "min_port", "max_port"): + my_hash *= 1024 + + attr_value = getattr(self, attr) - attr_value = getattr(self, attr) + if attr_value is not None: + my_hash += hash(attr_value) - if attr_value is not None: - my_hash += hash(attr_value) + my_hash *= 1024 + my_hash += hash(self.get_mask(False)) - my_hash *= 1024 - my_hash += hash(self.get_mask(False)) + self._hash = my_hash - return my_hash + return self._hash @lru_cache() def _get_mask_bin(self): @@ -845,6 +849,7 @@ class MicroExitPolicyRule(ExitPolicyRule): self.address = None # wildcard address self.min_port = min_port self.max_port = max_port + self._hash = None def is_address_wildcard(self): return True @@ -859,14 +864,17 @@ class MicroExitPolicyRule(ExitPolicyRule): return None def __hash__(self): - my_hash = 0 + if self._hash is None: + my_hash = 0 - for attr in ("is_accept", "min_port", "max_port"): - my_hash *= 1024 + for attr in ("is_accept", "min_port", "max_port"): + my_hash *= 1024 + + attr_value = getattr(self, attr) - attr_value = getattr(self, attr) + if attr_value is not None: + my_hash += hash(attr_value) - if attr_value is not None: - my_hash += hash(attr_value) + self._hash = my_hash - return my_hash + return self._hash diff --git a/stem/version.py b/stem/version.py index c87d325..44f1d02 100644 --- a/stem/version.py +++ b/stem/version.py @@ -150,6 +150,7 @@ class Version(object): def __init__(self, version_str): self.version_str = version_str version_parts = re.match(r'^([0-9]+)\.([0-9]+)\.([0-9]+)(\.[0-9]+)?(-\S*)?( $\S*$)?$', version_str) + self._hash = None if version_parts: major, minor, micro, patch, status, extra = version_parts.groups() @@ -248,17 +249,20 @@ class Version(object): return self._compare(other, lambda s, o: s >= o) def __hash__(self): - my_hash = 0 + if self._hash is None: + my_hash = 0 - for attr in ("major", "minor", "micro", "patch", "status"): - my_hash *= 1024 + for attr in ("major", "minor", "micro", "patch", "status"): + my_hash *= 1024 - attr_value = getattr(self, attr) + attr_value = getattr(self, attr) - if attr_value is not None: - my_hash += hash(attr_value) + if attr_value is not None: + my_hash += hash(attr_value) - return my_hash + self._hash = my_hash + + return self._hash class _VersionRequirements(object):

1 0

[stem/master] Dropping @lru_cache for Version hashing
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit d32d4ab45d27776385036b1a57d9329f270354fc Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 20:11:23 2013 -0700 Dropping @lru_cache for Version hashing The @lru_cache calls hash() so if ever called this would infinitely recurse. --- stem/version.py | 1 - 1 file changed, 1 deletion(-) diff --git a/stem/version.py b/stem/version.py index eca03cf..c87d325 100644 --- a/stem/version.py +++ b/stem/version.py @@ -247,7 +247,6 @@ class Version(object): return self._compare(other, lambda s, o: s >= o) - @lru_cache() def __hash__(self): my_hash = 0

1 0

[stem/master] Fixing AttributeError in use_directory_mirrors()
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 992c94bc6065cee6281266df6e482a6367dd56c6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 16:39:28 2013 -0700 Fixing AttributeError in use_directory_mirrors() Correcting a couple issues, one in the tests and another in the remote descriptor module, causing integ failures. ====================================================================== ERROR: test_use_directory_mirrors ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/integ/descriptor/remote.py", line 62, in test_use_directory_mirrors downloader.use_directory_mirrors() File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 419, in use_directory_mirrors if Flag.V2DIR in desc.flags: AttributeError: 'str' object has no attribute 'flags' ====================================================================== ERROR: test_using_authorities ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/integ/descriptor/remote.py", line 34, in test_using_authorities for authority, (address, dirport) in stem.descriptor.remote.DIRECTORY_AUTHORITIES.items(): --- stem/descriptor/remote.py | 2 +- test/integ/descriptor/remote.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 4b04767..aa4d00c 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -415,7 +415,7 @@ class DescriptorDownloader(object): consensus = list(self.get_consensus(document_handler = stem.descriptor.DocumentHandler.DOCUMENT).run())[0] - for desc in consensus.routers: + for desc in consensus.routers.values(): if Flag.V2DIR in desc.flags: new_endpoints.add((desc.address, desc.dir_port)) diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index d11a4ae..27062ea 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -31,19 +31,19 @@ class TestDescriptorDownloader(unittest.TestCase): queries = [] - for authority, (address, dirport) in stem.descriptor.remote.DIRECTORY_AUTHORITIES.items(): - queries.append(stem.descriptor.remote.Query( + for nickname, authority in stem.descriptor.remote.get_authorities().items(): + queries.append((stem.descriptor.remote.Query( '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', 'server-descriptor 1.0', - endpoints = [(address, dirport)], + endpoints = [(authority.address, authority.dir_port)], timeout = 30, - )) + ), authority)) - for query in queries: + for query, authority in queries: try: descriptors = list(query.run()) except Exception as exc: - self.fail("Unable to use %s (%s:%s, %s): %s" % (authority, address, dirport, type(exc), exc)) + self.fail("Unable to use %s (%s:%s, %s): %s" % (authority.nickname, authority.address, authority.dir_port, type(exc), exc)) self.assertEqual(1, len(descriptors)) self.assertEqual('moria1', descriptors[0].nickname)

1 0

[stem/master] Fixing python 3 compatablity for tordnsel test
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit eaa89a67ebf6339a68972e705b76a8e01677d7b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 12:21:06 2013 -0700 Fixing python 3 compatablity for tordnsel test ====================================================================== ERROR: test_parse_file ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/data/python3/test/unit/descriptor/tordnsel.py", line 55, in test_parse_file descriptors = list(_parse_file(io.BytesIO(TEST_DESC))) TypeError: 'str' does not support the buffer interface ---------------------------------------------------------------------- Ran 1 test in 0.001s --- test/unit/descriptor/tordnsel.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/descriptor/tordnsel.py b/test/unit/descriptor/tordnsel.py index af90f6d..b494a6f 100644 --- a/test/unit/descriptor/tordnsel.py +++ b/test/unit/descriptor/tordnsel.py @@ -9,7 +9,7 @@ import datetime from stem.util.tor_tools import is_valid_fingerprint from stem.descriptor.tordnsel import TorDNSEL, _parse_file -TEST_DESC = """\ +TEST_DESC = b"""\ @type tordnsel 1.0 Downloaded 2013-08-19 04:02:03 ExitNode 003A71137D959748C8157C4A76ECA639CEF5E33E @@ -28,14 +28,14 @@ LastStatus 2013-08-18 13:02:57 ExitAddress 46.10.211.205 2013-08-18 13:18:48 """ -MALFORMED_ENTRY_1 = """\ +MALFORMED_ENTRY_1 = b"""\ ExitNode 030B22437D99B2DB2908B747B6962EAD13AB4038 Published Today! LastStatus 2013-08-18 13:02:57 ExitAddress 46.10.211.205 2013-08-18 13:18:48 """ -MALFORMED_ENTRY_2 = """\ +MALFORMED_ENTRY_2 = b"""\ @type tordnsel 1.0 ExitNode 030B22437D99B2DB2908B747B6962EAD13AB4038 Published Today! @@ -67,13 +67,13 @@ class TestTorDNSELDescriptor(unittest.TestCase): # block content raises value error - extra = "ExtraContent goes here\n" + extra = b"ExtraContent goes here\n" descriptors = _parse_file(io.BytesIO(TEST_DESC + extra)) self.assertRaises(ValueError, list, descriptors) # malformed fingerprint raises value errors - extra = "ExitNode 030B22437D99B2DB2908B747B6" + extra = b"ExitNode 030B22437D99B2DB2908B747B6" self.assertRaises(ValueError, list, _parse_file(io.BytesIO(TEST_DESC + extra))) # malformed date raises value errors

1 0

[stem/master] Hash functions for descriptor classes
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 1ed6e2b7e553414736913b3cd440843d66ccea94 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 12:40:46 2013 -0700 Hash functions for descriptor classes Ok, finally found out what this python 2 vs 3 hashing oddity is. If you define an __eq__() method in python3 then it doesn't inherit its parent's __hash__(). This makes some sense, though it's unintuitive as hell. Oh well... http://stackoverflow.com/a/1608882/1067192 --- stem/descriptor/microdescriptor.py | 3 +++ stem/descriptor/networkstatus.py | 3 +++ stem/descriptor/server_descriptor.py | 6 ++++++ stem/exit_policy.py | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 1f9e8cb..61dce83 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -296,6 +296,9 @@ class Microdescriptor(Descriptor): return method(str(self).strip(), str(other).strip()) + def __hash__(self): + return hash(str(self).strip()) + def __eq__(self, other): return self._compare(other, lambda s, o: s == o) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index a2b07fb..b5eb5b7 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -566,6 +566,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): return method(str(self).strip(), str(other).strip()) + def __hash__(self): + return hash(str(self).strip()) + def __eq__(self, other): return self._compare(other, lambda s, o: s == o) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 160dab7..c84e8b8 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -820,6 +820,9 @@ class RelayDescriptor(ServerDescriptor): return method(str(self).strip(), str(other).strip()) + def __hash__(self): + return hash(str(self).strip()) + def __eq__(self, other): return self._compare(other, lambda s, o: s == o) @@ -951,6 +954,9 @@ class BridgeDescriptor(ServerDescriptor): return method(str(self).strip(), str(other).strip()) + def __hash__(self): + return hash(str(self).strip()) + def __eq__(self, other): return self._compare(other, lambda s, o: s == o) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 163f58b..0f033de 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -441,7 +441,7 @@ class MicroExitPolicy(ExitPolicy): return self._policy def __hash__(self): - return id(self) + return hash(str(self)) def __eq__(self, other): if isinstance(other, MicroExitPolicy):

1 0

[stem/master] Fixing python 3 issue with orphaned annotation exceptions
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit ab86475d484c9c727ba17b9cf39e1661d0e72a8a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 12:49:22 2013 -0700 Fixing python 3 issue with orphaned annotation exceptions ====================================================================== ERROR: test_annotations ---------------------------------------------------------------------- Traceback (most recent call last): File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 1087, in patched return func(*args, **keywargs) File "/home/atagar/Desktop/stem/test/data/python3/test/unit/descriptor/server_descriptor.py", line 224, in test_annotations self.assertRaises(ValueError, list, desc_iter) File "/opt/python3.3/lib/python3.3/unittest/case.py", line 570, in assertRaises return context.handle('assertRaises', callableObj, args, kwargs) File "/opt/python3.3/lib/python3.3/unittest/case.py", line 135, in handle callable_obj(*args, **kwargs) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/server_descriptor.py", line 157, in _parse_file raise ValueError('Content conform to being a server descriptor:\n%s' % '\n'.join(annotations)) TypeError: sequence item 0: expected str instance, bytes found ---------------------------------------------------------------------- Ran 31 tests in 0.028s FAILED (errors=1) --- stem/descriptor/server_descriptor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index c84e8b8..d4dbaf3 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -154,7 +154,8 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True, **kwargs): yield RelayDescriptor(descriptor_text, validate, annotations, **kwargs) else: if validate and annotations: - raise ValueError('Content conform to being a server descriptor:\n%s' % '\n'.join(annotations)) + orphaned_annotations = stem.util.str_tools._to_unicode(b'\n'.join(annotations)) + raise ValueError('Content conform to being a server descriptor:\n%s' % orphaned_annotations) break # done parsing descriptors

1 0

[stem/master] Fixing python 3 compatability for remote descriptor unit tests
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit a303b137a9ada7cc9a31a57ba2dcbeae89dd83a3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 12:55:24 2013 -0700 Fixing python 3 compatability for remote descriptor unit tests ====================================================================== ERROR: test_query_with_timeout ---------------------------------------------------------------------- Traceback (most recent call last): File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 1079, in patched arg = patching.__enter__() File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 1132, in __enter__ self.target = self.getter() File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 1294, in <lambda> getter = lambda: _importer(target) File "/opt/python3.3/lib/python3.3/unittest/mock.py", line 988, in _importer thing = __import__(import_path) ImportError: No module named 'urllib2' --- test/unit/descriptor/remote.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 4eda9e8..60a5c1a 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -6,6 +6,7 @@ import io import socket import unittest +import stem.prereq import stem.descriptor.remote try: @@ -14,6 +15,12 @@ try: except ImportError: from mock import patch +# The urlopen() method is in a different location depending on if we're using +# python 2.x or 3.x. The 2to3 converter accounts for this in imports, but not +# mock annotations. + +URL_OPEN = 'urllib.request.urlopen' if stem.prereq.is_python_3() else 'urllib2.urlopen' + # Output from requesting moria1's descriptor from itself... # % curl http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C… @@ -53,7 +60,7 @@ iO3EUE0AEYah2W9gdz8t+i3Dtr0zgqLS841GC/TyDKCm+MKmN8d098qnwK0NGF9q class TestDescriptorDownloader(unittest.TestCase): - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_query_download(self, urlopen_mock): """ Check Query functionality when we successfully download a descriptor. @@ -81,7 +88,7 @@ class TestDescriptorDownloader(unittest.TestCase): urlopen_mock.assert_called_once_with(expeced_url, timeout = None) - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_query_with_malformed_content(self, urlopen_mock): """ Query with malformed descriptor content. @@ -109,7 +116,7 @@ class TestDescriptorDownloader(unittest.TestCase): self.assertRaises(ValueError, query.run) - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_query_with_timeout(self, urlopen_mock): urlopen_mock.side_effect = socket.timeout('connection timed out') @@ -128,7 +135,7 @@ class TestDescriptorDownloader(unittest.TestCase): ) self.assertEqual(3, urlopen_mock.call_count) - @patch('urllib2.urlopen') + @patch(URL_OPEN) def test_can_iterate_multiple_times(self, urlopen_mock): urlopen_mock.return_value = io.BytesIO(TEST_DESCRIPTOR)

1 0

[stem/master] Fixing python 3 testing issue with key certs
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit bfd5a667f150d4fef77c6a730432494ee930610b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 13:20:08 2013 -0700 Fixing python 3 testing issue with key certs Test file wasn't being opened in bytes mode, causing... ====================================================================== ERROR: test_metrics_cert ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/data/python3/test/integ/descriptor/networkstatus.py", line 178, in test_metrics_cert cert = next(stem.descriptor.parse_file(cert_file)) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/__init__.py", line 200, in parse_file for desc in file_parser(descriptor_file): File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/__init__.py", line 241, in _parse_metrics_file for desc in stem.descriptor.networkstatus._parse_file_key_certs(descriptor_file, validate = validate, **kwargs): File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/networkstatus.py", line 252, in _parse_file_key_certs yield stem.descriptor.networkstatus.KeyCertificate(bytes.join(b"", keycert_content), validate = validate) TypeError: sequence item 0: expected bytes, str found --- stem/descriptor/__init__.py | 4 +++- test/integ/descriptor/networkstatus.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index d388fd0..d6b007e 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -371,7 +371,9 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi :param int end_position: end if we reach this point in the file :param bool include_ending_keyword: provides the keyword we broke on if **True** - :returns: **list** with the lines until we find one of the keywords, this is a two value tuple with the ending keyword if include_ending_keyword is **True** + :returns: **list** with the lines until we find one of the keywords, this is + a two value tuple with the ending keyword if include_ending_keyword is + **True** """ content = None if skip else [] diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 7e07939..5209f51 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -174,7 +174,7 @@ GM9hAsAMRX9Ogqhq5UjDNqEsvDKuyVeyh7unSZEOip9Zr6K/+7VsVPNb8vfBRBjo cert_path = get_resource("metrics_cert") - with open(cert_path) as cert_file: + with open(cert_path, 'rb') as cert_file: cert = next(stem.descriptor.parse_file(cert_file)) self.assertEquals(3, cert.version) self.assertEquals(None, cert.address)

1 0

[stem/master] Correcting test issues with python 2.6 and 3.x
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 216937c0821e27301f60dd77a1addfb286b1b3ea Merge: 242569a 6c81b10 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 17:40:51 2013 -0700 Correcting test issues with python 2.6 and 3.x Generally I just work with python 2.7, so other interpretor versions just get love prior to releases. Most of this is issues with our tests, but @lru_cache introduced a lot of legitimate regressions for python 3.x. run_tests.py | 6 +- stem/descriptor/__init__.py | 4 +- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 5 +- stem/descriptor/networkstatus.py | 3 + stem/descriptor/remote.py | 2 +- stem/descriptor/server_descriptor.py | 11 +- stem/exit_policy.py | 128 ++++++++++++++------- stem/prereq.py | 21 +++- stem/util/lru_cache.py | 2 +- stem/util/proc.py | 2 +- stem/version.py | 21 ++-- test/integ/control/controller.py | 7 +- test/integ/descriptor/networkstatus.py | 2 +- test/integ/descriptor/remote.py | 12 +- test/integ/process.py | 6 +- test/integ/response/protocolinfo.py | 8 +- test/integ/util/system.py | 6 +- test/network.py | 6 +- test/settings.cfg | 2 + test/unit/connection/authentication.py | 8 +- test/unit/control/controller.py | 8 +- test/unit/descriptor/export.py | 8 +- test/unit/descriptor/networkstatus/document_v3.py | 4 +- test/unit/descriptor/reader.py | 6 +- test/unit/descriptor/remote.py | 21 +++- test/unit/descriptor/server_descriptor.py | 8 +- test/unit/descriptor/tordnsel.py | 10 +- test/unit/response/events.py | 8 +- test/unit/response/protocolinfo.py | 8 +- test/unit/tutorial.py | 8 +- test/unit/util/connection.py | 8 +- test/unit/util/proc.py | 8 +- test/unit/util/system.py | 8 +- test/unit/version.py | 8 +- test/util.py | 6 +- 36 files changed, 278 insertions(+), 113 deletions(-)

1 0

[stem/master] Python 3 compatability for mapaddress test
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 6c81b101dd69cf9f4b9170aa089d98e38220f383 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 17:25:34 2013 -0700 Python 3 compatability for mapaddress test Quite a few byte vs unicode gotchas. Also, the behavior of indexing into byte strings changed in python 3 (it provides ints rather than characters). ====================================================================== ERROR: test_mapaddress ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/data/python3/test/integ/control/controller.py", line 813, in test_mapaddress test.network.negotiate_socks(s, '1.2.1.2', 80) File "/home/atagar/Desktop/stem/test/data/python3/test/network.py", line 321, in negotiate_socks request = "\x04\x01" + struct.pack("!H", port) + "\x00\x00\x00\x01" + "\x00" + host + "\x00" TypeError: Can't convert 'bytes' object to str implicitly --- test/integ/control/controller.py | 7 ++++--- test/network.py | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 69112cf..1c0e468 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -16,6 +16,7 @@ import stem.descriptor.reader import stem.descriptor.router_status_entry import stem.response.protocolinfo import stem.socket +import stem.util.str_tools import stem.version import test.network import test.runner @@ -811,7 +812,7 @@ class TestController(unittest.TestCase): s.settimeout(30) s.connect(('127.0.0.1', int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]))) test.network.negotiate_socks(s, '1.2.1.2', 80) - s.sendall(test.network.ip_request) # make the http request for the ip address + s.sendall(stem.util.str_tools._to_bytes(test.network.ip_request)) # make the http request for the ip address response = s.recv(1000) if response: @@ -826,9 +827,9 @@ class TestController(unittest.TestCase): # everything after the blank line is the 'data' in a HTTP response. # The response data for our request for request should be an IP address + '\n' - ip_addr = response[response.find("\r\n\r\n"):].strip() + ip_addr = response[response.find(b"\r\n\r\n"):].strip() - self.assertTrue(stem.util.connection.is_valid_ipv4_address(ip_addr)) + self.assertTrue(stem.util.connection.is_valid_ipv4_address(stem.util.str_tools._to_unicode(ip_addr))) def test_get_microdescriptor(self): """ diff --git a/test/network.py b/test/network.py index 78ebf21..fbb378a 100644 --- a/test/network.py +++ b/test/network.py @@ -20,6 +20,8 @@ import socket import struct import stem.util.connection +import stem.util.str_tools + from stem import ProtocolError, SocketError # Store a reference to the original class so we can find it after @@ -318,11 +320,11 @@ def negotiate_socks(sock, host, port): """ # SOCKS4a request here - http://en.wikipedia.org/wiki/SOCKS#Protocol - request = "\x04\x01" + struct.pack("!H", port) + "\x00\x00\x00\x01" + "\x00" + host + "\x00" + request = b"\x04\x01" + struct.pack("!H", port) + b"\x00\x00\x00\x01" + b"\x00" + stem.util.str_tools._to_bytes(host) + b"\x00" sock.sendall(request) response = sock.recv(8) - if len(response) != 8 or response[0] != "\x00" or response[1] != "\x5a": + if len(response) != 8 or response[0:2] != b"\x00\x5a": sock.close() raise ProtocolError(error_msgs.get(response[1], "SOCKS server returned unrecognized error code"))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013