October 2013 - tor-commits - lists.torproject.org

[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 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] 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] 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] 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] Fixing python 3 issue concerning exit policy compression
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 208c03cded57507f835265d7e4d2b4677d0e30e5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 20:07:52 2013 -0700 Fixing python 3 issue concerning exit policy compression Oops, forgot about the byte vs unicode differences when doing compression for the ExitPolicy. --- stem/exit_policy.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index a358908..9c60bda 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -300,13 +300,16 @@ class ExitPolicy(object): rules = [] is_all_accept, is_all_reject = True, True - if isinstance(self._input_rules, str): - decompressed_rules = zlib.decompress(self._input_rules).split(',') + if isinstance(self._input_rules, bytes): + decompressed_rules = zlib.decompress(self._input_rules).split(b',') else: decompressed_rules = self._input_rules for rule in decompressed_rules: - if isinstance(rule, (bytes, unicode)): + if isinstance(rule, bytes): + rule = stem.util.str_tools._to_unicode(rule) + + if isinstance(rule, unicode): rule = ExitPolicyRule(rule.strip()) if rule.is_accept:

1 0

[stem/master] Fixing a couple python 3 network status document TypeErrors
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit e1bf7cbacb8797845c1bc2a778baa93d9748f4c9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 13 12:10:38 2013 -0700 Fixing a couple python 3 network status document TypeErrors ====================================================================== ERROR: test_duplicate_fields ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/data/python3/test/unit/descriptor/networkstatus/document_v3.py", line 247, in test_duplicate_fields if not is_consensus and lines[index].startswith('dir-source'): TypeError: startswith first arg must be bytes or a tuple of bytes, not str ====================================================================== ERROR: test_misordered_fields ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/data/python3/test/unit/descriptor/networkstatus/document_v3.py", line 225, in test_misordered_fields elif not is_consensus and lines[index].startswith('dir-source'): TypeError: startswith first arg must be bytes or a tuple of bytes, not str ---------------------------------------------------------------------- Ran 35 tests in 0.234s --- test/unit/descriptor/networkstatus/document_v3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 71ef8b6..4c82617 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -222,7 +222,7 @@ class TestNetworkStatusDocument(unittest.TestCase): if is_consensus and lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): break - elif not is_consensus and lines[index].startswith('dir-source'): + elif not is_consensus and lines[index].startswith(b'dir-source'): break # swaps this line with the one after it @@ -244,7 +244,7 @@ class TestNetworkStatusDocument(unittest.TestCase): lines = get_network_status_document_v3(attr, content = True).split(b"\n") for index, line in enumerate(lines): - if not is_consensus and lines[index].startswith('dir-source'): + if not is_consensus and lines[index].startswith(b'dir-source'): break # Stop when we hit the 'directory-signature' for a couple reasons...

1 0

[stem/master] Python 3 lru_cache isn't a collections annotation
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 677ee1570cc1378b8abadb4071627ff53510cb8a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 19:23:04 2013 -0700 Python 3 lru_cache isn't a collections annotation Oops, it's in functools, not collections. --- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/exit_policy.py | 2 +- stem/prereq.py | 2 +- stem/util/proc.py | 2 +- stem/version.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 0d50f75..b13efff 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -84,7 +84,7 @@ from stem.descriptor import ( try: # added in python 3.2 - from collections import lru_cache + from functools import lru_cache except ImportError: from stem.util.lru_cache import lru_cache diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index c48419a..1f9e8cb 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -77,7 +77,7 @@ from stem.descriptor import ( try: # added in python 3.2 - from collections import lru_cache + from functools import lru_cache except ImportError: from stem.util.lru_cache import lru_cache diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 51b382f..160dab7 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -54,7 +54,7 @@ from stem.descriptor import ( try: # added in python 3.2 - from collections import lru_cache + from functools import lru_cache except ImportError: from stem.util.lru_cache import lru_cache diff --git a/stem/exit_policy.py b/stem/exit_policy.py index a00665e..9366a54 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -65,7 +65,7 @@ import stem.util.str_tools try: # added in python 3.2 - from collections import lru_cache + from functools import lru_cache except ImportError: from stem.util.lru_cache import lru_cache diff --git a/stem/prereq.py b/stem/prereq.py index 22b5819..df2e10d 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -24,7 +24,7 @@ import sys try: # added in python 3.2 - from collections import lru_cache + from functools import lru_cache except ImportError: from stem.util.lru_cache import lru_cache diff --git a/stem/util/proc.py b/stem/util/proc.py index fbff14c..95e75de 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -55,7 +55,7 @@ from stem.util import log try: # added in python 3.2 - from collections import lru_cache + from functools import lru_cache except ImportError: from stem.util.lru_cache import lru_cache diff --git a/stem/version.py b/stem/version.py index bf41898..eca03cf 100644 --- a/stem/version.py +++ b/stem/version.py @@ -64,7 +64,7 @@ import stem.util.system try: # added in python 3.2 - from collections import lru_cache + from functools import lru_cache except ImportError: from stem.util.lru_cache import lru_cache

1 0

[stem/master] Adding hash functions to exit policy classes
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 4ef5ee1ee8fbecabeaee872f2681cdda1fb86584 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 20:18:12 2013 -0700 Adding hash functions to exit policy classes Huh, didn't expect that. To work the @lru_cache requires that all arguments (including the class in the ase of methods) are hashable. This makes perfectly sense, after all the cache is a 'argument => cached value' dictionary. Under python 2.x all seemed to be well, but under python 3.x the @lru_cache complained that our classes weren't hashable (which... well, they aren't). Why, then, did it work under python 2.x? Turns out there's a subtle difference where our object parent provides a __hash__ method for our id, but in python 3.x it's a little different (object still does, but for reasons I haven't been able to figure out it doesn't for our classes). The ExitPolicyRule can certainly be hashable. The ExitPolicy, however, is a lot trickier due to its lazy loading of rules. For now just opting for the same behavior as python 2.x and using the address. --- stem/exit_policy.py | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 9366a54..a358908 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -349,6 +349,14 @@ class ExitPolicy(object): def __str__(self): return ', '.join([str(rule) for rule in self._get_rules()]) + def __hash__(self): + # TODO: It would be nice to provide a real hash function, but doing so is + # tricky due to how we lazily load the rules. Like equality checks a proper + # hash function would need to call _get_rules(), but that's behind + # @lru_cache which calls hash() forming a circular dependency. + + return id(self) + def __eq__(self, other): if isinstance(other, ExitPolicy): return self._get_rules() == list(other) @@ -429,6 +437,9 @@ class MicroExitPolicy(ExitPolicy): def __str__(self): return self._policy + def __hash__(self): + return id(self) + def __eq__(self, other): if isinstance(other, MicroExitPolicy): return str(self) == str(other) @@ -682,6 +693,22 @@ class ExitPolicyRule(object): return label + def __hash__(self): + my_hash = 0 + + for attr in ("is_accept", "address", "min_port", "max_port"): + my_hash *= 1024 + + attr_value = getattr(self, attr) + + if attr_value is not None: + my_hash += hash(attr_value) + + my_hash *= 1024 + my_hash += hash(self.get_mask(False)) + + return my_hash + @lru_cache() def _get_mask_bin(self): # provides an integer representation of our mask @@ -792,7 +819,7 @@ class ExitPolicyRule(object): # 0.0.0.0/0" == "accept 0.0.0.0/0.0.0.0" will be True), but these # policies are effectively equivalent. - return str(self) == str(other) + return hash(self) == hash(other) else: return False @@ -827,3 +854,16 @@ class MicroExitPolicyRule(ExitPolicyRule): def get_masked_bits(self): return None + + def __hash__(self): + my_hash = 0 + + for attr in ("is_accept", "min_port", "max_port"): + my_hash *= 1024 + + attr_value = getattr(self, attr) + + if attr_value is not None: + my_hash += hash(attr_value) + + return my_hash

1 0

[stem/master] Using @lru_cache for exit policy's str()
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 1dfa353ecfbef39ee606231e745b9b6318fd3a31 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 17:35:55 2013 -0700 Using @lru_cache for exit policy's str() Oops, missed one of our instances of manual caching. --- stem/exit_policy.py | 65 +++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index ee13308..a00665e 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -499,10 +499,6 @@ class ExitPolicyRule(object): self._apply_addrspec(rule, addrspec) self._apply_portspec(rule, portspec) - # Lazily loaded string representation of our policy. - - self._str_representation = None - # If true then a submask of /0 is treated by is_address_wildcard() as being # a wildcard. @@ -642,6 +638,7 @@ class ExitPolicyRule(object): return self._masked_bits + @lru_cache() def __str__(self): """ Provides the string representation of our policy. This does not @@ -651,42 +648,39 @@ class ExitPolicyRule(object): to re-create this rule. """ - if self._str_representation is None: - label = "accept " if self.is_accept else "reject " + label = "accept " if self.is_accept else "reject " - if self.is_address_wildcard(): - label += "*:" - else: - address_type = self.get_address_type() - - if address_type == AddressType.IPv4: - label += self.address - else: - label += "[%s]" % self.address - - # Including our mask label as follows... - # - exclude our mask if it doesn't do anything - # - use our masked bit count if we can - # - use the mask itself otherwise - - if (address_type == AddressType.IPv4 and self._masked_bits == 32) or \ - (address_type == AddressType.IPv6 and self._masked_bits == 128): - label += ":" - elif self._masked_bits is not None: - label += "/%i:" % self._masked_bits - else: - label += "/%s:" % self.get_mask() + if self.is_address_wildcard(): + label += "*:" + else: + address_type = self.get_address_type() - if self.is_port_wildcard(): - label += "*" - elif self.min_port == self.max_port: - label += str(self.min_port) + if address_type == AddressType.IPv4: + label += self.address + else: + label += "[%s]" % self.address + + # Including our mask label as follows... + # - exclude our mask if it doesn't do anything + # - use our masked bit count if we can + # - use the mask itself otherwise + + if (address_type == AddressType.IPv4 and self._masked_bits == 32) or \ + (address_type == AddressType.IPv6 and self._masked_bits == 128): + label += ":" + elif self._masked_bits is not None: + label += "/%i:" % self._masked_bits else: - label += "%i-%i" % (self.min_port, self.max_port) + label += "/%s:" % self.get_mask() - self._str_representation = label + if self.is_port_wildcard(): + label += "*" + elif self.min_port == self.max_port: + label += str(self.min_port) + else: + label += "%i-%i" % (self.min_port, self.max_port) - return self._str_representation + return label @lru_cache() def _get_mask_bin(self): @@ -821,7 +815,6 @@ class MicroExitPolicyRule(ExitPolicyRule): self.address = None # wildcard address self.min_port = min_port self.max_port = max_port - self._str_representation = None def is_address_wildcard(self): return True

1 0