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

[stem/master] Accounting for __builtin__ renaming
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 62086346044c9eab1ce68d830669559773ef22b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 21 08:57:02 2013 -0800 Accounting for __builtin__ renaming Python 3.x renames __builtin__ to builtins... ====================================================================== ERROR: test_parse_circ_path ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/control/controller.py", line 24, in setUp mocking.revert_mocking() File "/home/atagar/Desktop/stem/test/data/python3/test/mocking.py", line 404, in revert_mocking if module == __builtin__: NameError: global name '__builtin__' is not defined --- test/mocking.py | 12 +++++++++++- test/settings.cfg | 1 + 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index 82b9790..192d59c 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -58,6 +58,7 @@ import stem.descriptor.extrainfo_descriptor import stem.descriptor.networkstatus import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor +import stem.prereq import stem.response import stem.socket @@ -401,7 +402,16 @@ def revert_mocking(): for mock_id in mock_ids: module, function, impl = MOCK_STATE[mock_id] - if module == __builtin__: + # Python 3.x renamed __builtin__ to builtins. Ideally we'd account for + # this with a simple 'import __builtin__ as builtins' but that somehow + # makes the following check fail. Haven't a clue why. + + if stem.prereq.is_python_3(): + builtin_module = builtins + else: + builtin_module = __builtin__ + + if module == builtin_module: setattr(__builtin__, function, impl) else: setattr(module, function, impl) diff --git a/test/settings.cfg b/test/settings.cfg index ebaf6c0..66475ee 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -157,5 +157,6 @@ pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 32 +pyflakes.ignore test/mocking.py => undefined name 'builtins' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names

1 0

[stem/master] Using byte string for base64.b64decode in python 3
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 2e7913aa6c59d147ef5ae926d456c54ec459dd52 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 12:17:43 2013 -0800 Using byte string for base64.b64decode in python 3 First correction for the ASCII -> Unicode switch over in python 3. ====================================================================== ERROR: test_get_network_status ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/router_status_entry.py", line 702, in _decode_fingerprint identity_decoded = base64.b64decode(identity) File "/usr/lib/python3.2/base64.py", line 83, in b64decode raise TypeError("expected bytes, not %s" % s.__class__.__name__) TypeError: expected bytes, not str During handling of the above exception, another exception occurred: Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/control/controller.py", line 247, in test_get_network_status router = stem.descriptor.router_status_entry.RouterStatusEntryV2(desc) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/router_status_entry.py", line 254, in __init__ super(RouterStatusEntryV2, self).__init__(content, validate, document) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/router_status_entry.py", line 149, in __init__ self._parse(entries, validate) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/router_status_entry.py", line 261, in _parse _parse_r_line(self, value, validate, True) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/router_status_entry.py", line 495, in _parse_r_line desc.fingerprint = _decode_fingerprint(r_comp[1], validate) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/router_status_entry.py", line 707, in _decode_fingerprint raise ValueError("Unable to decode identity string '%s'" % identity) ValueError: Unable to decode identity string '/96bKo4soysolMgKn5Hex2nyFSY=' ---------------------------------------------------------------------- Ran 9 tests in 0.063s --- stem/descriptor/router_status_entry.py | 6 ++++-- stem/descriptor/server_descriptor.py | 3 ++- stem/prereq.py | 4 ++-- stem/util/str_tools.py | 28 ++++++++++++++++++++++++++++ test/settings.cfg | 1 + 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 9af2f44..7f9875b 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -21,6 +21,7 @@ import datetime import stem.descriptor import stem.exit_policy +import stem.util.str_tools def _parse_file(document_file, validate, entry_class, entry_keyword = "r", start_position = None, end_position = None, section_end_keywords = (), extra_args = ()): @@ -699,7 +700,7 @@ def _decode_fingerprint(identity, validate): fingerprint = "" try: - identity_decoded = base64.b64decode(identity) + identity_decoded = base64.b64decode(stem.util.str_tools.to_bytes(identity)) except TypeError: if not validate: return None @@ -717,7 +718,8 @@ def _decode_fingerprint(identity, validate): # >>> '0xa'[2:].zfill(2).upper() # '0A' - fingerprint += hex(ord(char))[2:].zfill(2).upper() + char_int = char if isinstance(char, int) else ord(char) + fingerprint += hex(char_int)[2:].zfill(2).upper() if not stem.util.tor_tools.is_valid_fingerprint(fingerprint): if not validate: diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 38781bd..1cf4d31 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -36,6 +36,7 @@ import stem.descriptor.extrainfo_descriptor import stem.exit_policy import stem.prereq import stem.util.connection +import stem.util.str_tools import stem.util.tor_tools import stem.version @@ -818,7 +819,7 @@ class RelayDescriptor(ServerDescriptor): # get the key representation in bytes - key_bytes = base64.b64decode(key_as_string) + key_bytes = base64.b64decode(stem.util.str_tools.to_bytes(key_as_string)) return key_bytes diff --git a/stem/prereq.py b/stem/prereq.py index b0a508e..46913e4 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -23,8 +23,6 @@ series). Other requirements for complete functionality are... import sys -from stem.util import log - IS_CRYPTO_AVAILABLE = None @@ -76,6 +74,8 @@ def is_crypto_available(): global IS_CRYPTO_AVAILABLE if IS_CRYPTO_AVAILABLE is None: + from stem.util import log + try: from Crypto.PublicKey import RSA from Crypto.Util import asn1 diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 25512b6..022874e 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -5,6 +5,7 @@ Toolkit for various string activity. :: + to_bytes - normalizes string ASCII bytes to_camel_case - converts a string to camel case get_size_label - human readable label for a number of bytes get_time_label - human readable label for a number of seconds @@ -17,6 +18,8 @@ Toolkit for various string activity. import datetime +import stem.prereq + # label conversion tuples of the form... # (bits / bytes / seconds, short label, long label) SIZE_UNITS_BITS = ( @@ -44,6 +47,31 @@ TIME_UNITS = ( (1.0, "s", " second"), ) +if stem.prereq.is_python_3(): + import codecs + + def _to_bytes(msg): + return codecs.latin_1_encode(msg)[0] +else: + def _to_bytes(msg): + return msg + + +def to_bytes(msg): + """ + Provides the ASCII bytes for the given string. This is purely to provide + python 3 compatability, normalizing the unicode/ASCII change in the version + bump. For an explanation of this see... + + http://python3porting.com/problems.html#nicer-solutions + + :param msg label: string to be converted + + :returns: ASCII bytes for string + """ + + return _to_bytes(msg) + def to_camel_case(label, divider = "_", joiner = " "): """ diff --git a/test/settings.cfg b/test/settings.cfg index 66475ee..4d99bfe 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -157,6 +157,7 @@ pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 32 +pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes' from line 53 pyflakes.ignore test/mocking.py => undefined name 'builtins' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names

1 0

[stem/master] Using rich comparison functions
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 5914ae523eb393383a120cd24c12c508e0ffaeac Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 22 09:27:45 2013 -0800 Using rich comparison functions Python 3.x drops support for __cmp__, requiring that users opt for rich comparison methods instead... http://python3porting.com/problems.html#unorderable-types-cmp-and-cmp ====================================================================== ERROR: test_event_listening ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/control/controller.py", line 285, in test_event_listening self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.BW) File "/usr/lib/python3.2/unittest/case.py", line 574, in assertRaises callableObj(*args, **kwargs) File "/home/atagar/Desktop/stem/test/data/python3/stem/control.py", line 1438, in add_event_listener if not self.get_version().meets_requirements(event_version): File "/home/atagar/Desktop/stem/test/data/python3/stem/version.py", line 175, in meets_requirements return self >= requirements TypeError: unorderable types: Version() >= Version() This change uncovered a couple bugs where events failed to strip off the trailing 'OK'. I'm not entirely sure why the previous comparisons didn't catch this, but oh well - fixed now. --- stem/descriptor/networkstatus.py | 66 ++++++++++++++++++++++++-------- stem/descriptor/router_status_entry.py | 60 +++++++++++++++++++++++------ stem/descriptor/server_descriptor.py | 30 +++++++++++--- stem/response/events.py | 4 +- stem/version.py | 30 +++++++------- 5 files changed, 139 insertions(+), 51 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index c1bbadf..511f5b0 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -528,11 +528,20 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): return self._header.meets_consensus_method(method) - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, NetworkStatusDocumentV3): - return 1 + return False - return str(self) > str(other) + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) + + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class _DocumentHeader(object): @@ -1124,11 +1133,20 @@ class DirectoryAuthority(stem.descriptor.Descriptor): return self._unrecognized_lines - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, DirectoryAuthority): - return 1 + return False + + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) - return str(self) > str(other) + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class KeyCertificate(stem.descriptor.Descriptor): @@ -1285,11 +1303,20 @@ class KeyCertificate(stem.descriptor.Descriptor): return self._unrecognized_lines - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, KeyCertificate): - return 1 + return False - return str(self) > str(other) + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) + + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class DocumentSignature(object): @@ -1321,17 +1348,24 @@ class DocumentSignature(object): self.key_digest = key_digest self.signature = signature - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, DocumentSignature): - return 1 + return False for attr in ("identity", "key_digest", "signature"): - if getattr(self, attr) > getattr(other, attr): - return 1 - elif getattr(self, attr) < getattr(other, attr): - return -1 + if getattr(self, attr) != getattr(other, attr): + return method(getattr(self, attr), getattr(other, attr)) + + return method(True, True) # we're equal + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) - return 0 + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class BridgeNetworkStatusDocument(NetworkStatusDocument): diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index a19f17f..9af2f44 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -222,11 +222,20 @@ class RouterStatusEntry(stem.descriptor.Descriptor): return list(self._unrecognized_lines) - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, RouterStatusEntry): - return 1 + return False - return str(self) > str(other) + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) + + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class RouterStatusEntryV2(RouterStatusEntry): @@ -266,11 +275,20 @@ class RouterStatusEntryV2(RouterStatusEntry): def _single_fields(self): return ('r', 's', 'v') - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, RouterStatusEntryV2): - return 1 + return False + + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) - return str(self) > str(other) + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class RouterStatusEntryV3(RouterStatusEntry): @@ -348,11 +366,20 @@ class RouterStatusEntryV3(RouterStatusEntry): def _single_fields(self): return ('r', 's', 'v', 'w', 'p') - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, RouterStatusEntryV3): - return 1 + return False - return str(self) > str(other) + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) + + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class RouterStatusEntryMicroV3(RouterStatusEntry): @@ -410,11 +437,20 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): def _single_fields(self): return ('r', 's', 'v', 'w', 'm') - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, RouterStatusEntryMicroV3): - return 1 + return False + + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) - return str(self) > str(other) + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) def _parse_r_line(desc, value, validate, include_digest = True): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index a4548bf..38781bd 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -793,11 +793,20 @@ class RelayDescriptor(ServerDescriptor): ServerDescriptor._parse(self, entries, validate) - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, RelayDescriptor): - return 1 + return False - return str(self).strip() > str(other).strip() + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) + + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) @staticmethod def _get_key_bytes(key_string): @@ -918,8 +927,17 @@ class BridgeDescriptor(ServerDescriptor): def _last_keyword(self): return None - def __cmp__(self, other): + def _compare(self, other, method): if not isinstance(other, BridgeDescriptor): - return 1 + return False + + return method(str(self).strip(), str(other).strip()) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) - return str(self).strip() > str(other).strip() + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) diff --git a/stem/response/events.py b/stem/response/events.py index 563b685..486e448 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -564,7 +564,7 @@ class NetworkStatusEvent(Event): _VERSION_ADDED = stem.version.Requirement.EVENT_NS def _parse(self): - content = str(self).lstrip("NS\n") + content = str(self).lstrip("NS\n").rstrip("\nOK") self.desc = list(stem.descriptor.router_status_entry._parse_file( StringIO.StringIO(content), @@ -589,7 +589,7 @@ class NewConsensusEvent(Event): _VERSION_ADDED = stem.version.Requirement.EVENT_NEWCONSENSUS def _parse(self): - content = str(self).lstrip("NEWCONSENSUS\n") + content = str(self).lstrip("NEWCONSENSUS\n").rstrip("\nOK") self.desc = list(stem.descriptor.router_status_entry._parse_file( StringIO.StringIO(content), diff --git a/stem/version.py b/stem/version.py index 47b8393..46ed394 100644 --- a/stem/version.py +++ b/stem/version.py @@ -18,9 +18,7 @@ easily parsed and compared, for instance... get_system_tor_version - gets the version of our system's tor installation Version - Tor versioning information - |- meets_requirements - checks if this version meets the given requirements - |- __str__ - string representation - +- __cmp__ - compares with another Version + +- meets_requirements - checks if this version meets the given requirements VersionRequirements - Series of version requirements |- greater_than - adds rule that matches if we're greater than a version @@ -187,22 +185,20 @@ class Version(object): return self.version_str - def __cmp__(self, other): + def _compare(self, other, method): """ Compares version ordering according to the spec. """ if not isinstance(other, Version): - return 1 # this is also used for equality checks + return False for attr in ("major", "minor", "micro", "patch"): my_version = max(0, self.__dict__[attr]) other_version = max(0, other.__dict__[attr]) - if my_version > other_version: - return 1 - elif my_version < other_version: - return -1 + if my_version != other_version: + return method(my_version, other_version) # According to the version spec... # @@ -212,12 +208,16 @@ class Version(object): my_status = self.status if self.status else "" other_status = other.status if other.status else "" - if my_status > other_status: - return 1 - elif my_status < other_status: - return -1 - else: - return 0 + return method(my_status, other_status) + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __lt__(self, other): + return self._compare(other, lambda s, o: s < o) + + def __le__(self, other): + return self._compare(other, lambda s, o: s <= o) class VersionRequirements(object):

1 0

[stem/master] Including signature method in DocumentSignature's comparison
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 4f108d1dffd2e23db8ced6d4cb755a336a0767f3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 25 09:57:54 2013 -0800 Including signature method in DocumentSignature's comparison The DocumentSignature's method argument is new-ish, and its comparison function wasn't taking it into account. Both fixing this and using the default method (sha1) in the mock instance so our tests still pass. --- stem/descriptor/networkstatus.py | 2 +- test/mocking.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 511f5b0..f17d705 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1352,7 +1352,7 @@ class DocumentSignature(object): if not isinstance(other, DocumentSignature): return False - for attr in ("identity", "key_digest", "signature"): + for attr in ("method", "identity", "key_digest", "signature"): if getattr(self, attr) != getattr(other, attr): return method(getattr(self, attr), getattr(other, attr)) diff --git a/test/mocking.py b/test/mocking.py index 192d59c..c2baffb 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -81,7 +81,7 @@ WPi4Fl2qryzTb3QO5r5x7T8OsG2IBUET1bLQzmtbC560SYR49IvVAgMBAAE= """ DOC_SIG = stem.descriptor.networkstatus.DocumentSignature( - None, + "sha1", "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4", "BF112F1C6D5543CFD0A32215ACABD4197B5279AD", "-----BEGIN SIGNATURE-----%s-----END SIGNATURE-----" % CRYPTO_BLOB)

1 0

[stem/master] Disabling static checks when using python 3.x
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 137aed3eadb184fd3e96828cd207220d3e09a043 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 21 09:02:18 2013 -0800 Disabling static checks when using python 3.x Not only are our static checks useless with the python 3.x codebase (pyflakes probably ins't python 3.x compatable and who cares about PEP8 issues with the output?), the pyflake check errors... Traceback (most recent call last): File "./test/data/python3/run_tests.py", line 554, in <module> style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "stem"))) File "/home/atagar/Desktop/stem/test/data/python3/test/check_whitespace.py", line 132, in pyflakes_issues line_match = re.match("^(.*):(\d+): (.*)$", line) File "/usr/lib/python3.2/re.py", line 153, in match return _compile(pattern, flags).match(string) TypeError: can't use a string pattern on a bytes-like object --- run_tests.py | 77 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 41 insertions(+), 36 deletions(-) diff --git a/run_tests.py b/run_tests.py index 566eb41..c66c9f8 100755 --- a/run_tests.py +++ b/run_tests.py @@ -338,6 +338,45 @@ def _python3_setup(python3_destination): return True +def _print_style_issues(): + base_path = os.path.sep.join(__file__.split(os.path.sep)[:-1]).lstrip("./") + style_issues = test.check_whitespace.get_issues(os.path.join(base_path, "stem")) + style_issues.update(test.check_whitespace.get_issues(os.path.join(base_path, "test"))) + style_issues.update(test.check_whitespace.get_issues(os.path.join(base_path, "run_tests.py"))) + + # If we're doing some sort of testing (unit or integ) and pyflakes is + # available then use it. Its static checks are pretty quick so there's not + # much overhead in including it with all tests. + + if CONFIG["argument.unit"] or CONFIG["argument.integ"]: + if system.is_available("pyflakes"): + style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "stem"))) + style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "test"))) + style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "run_tests.py"))) + else: + test.output.print_line("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", *ERROR_ATTR) + + if CONFIG["argument.style"]: + if system.is_available("pep8"): + style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "stem"))) + style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "test"))) + style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "run_tests.py"))) + else: + test.output.print_line("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", *ERROR_ATTR) + + if style_issues: + test.output.print_line("STYLE ISSUES", term.Color.BLUE, term.Attr.BOLD) + + for file_path in style_issues: + test.output.print_line("* %s" % file_path, term.Color.BLUE, term.Attr.BOLD) + + for line_number, msg in style_issues[file_path]: + line_count = "%-4s" % line_number + test.output.print_line(" line %s - %s" % (line_count, msg)) + + print + + if __name__ == '__main__': try: stem.prereq.check_requirements() @@ -540,42 +579,8 @@ if __name__ == '__main__': # TODO: note unused config options afterward? - base_path = os.path.sep.join(__file__.split(os.path.sep)[:-1]).lstrip("./") - style_issues = test.check_whitespace.get_issues(os.path.join(base_path, "stem")) - style_issues.update(test.check_whitespace.get_issues(os.path.join(base_path, "test"))) - style_issues.update(test.check_whitespace.get_issues(os.path.join(base_path, "run_tests.py"))) - - # If we're doing some sort of testing (unit or integ) and pyflakes is - # available then use it. Its static checks are pretty quick so there's not - # much overhead in including it with all tests. - - if CONFIG["argument.unit"] or CONFIG["argument.integ"]: - if system.is_available("pyflakes"): - style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "stem"))) - style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "test"))) - style_issues.update(test.check_whitespace.pyflakes_issues(os.path.join(base_path, "run_tests.py"))) - else: - test.output.print_line("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", *ERROR_ATTR) - - if CONFIG["argument.style"]: - if system.is_available("pep8"): - style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "stem"))) - style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "test"))) - style_issues.update(test.check_whitespace.pep8_issues(os.path.join(base_path, "run_tests.py"))) - else: - test.output.print_line("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", *ERROR_ATTR) - - if style_issues: - test.output.print_line("STYLE ISSUES", term.Color.BLUE, term.Attr.BOLD) - - for file_path in style_issues: - test.output.print_line("* %s" % file_path, term.Color.BLUE, term.Attr.BOLD) - - for line_number, msg in style_issues[file_path]: - line_count = "%-4s" % line_number - test.output.print_line(" line %s - %s" % (line_count, msg)) - - print + if not stem.prereq.is_python_3(): + _print_style_issues() runtime = time.time() - start_time

1 0

[stem/master] The min/max() functions can't accept None in python 3
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 4ccbe411ff3320a09e21baa44280c357fd44df6e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 12:41:50 2013 -0800 The min/max() functions can't accept None in python 3 In python 2: >>> max(5, None) 5 In python 3: >>> max(5, None) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: unorderable types: NoneType() > int() ====================================================================== ERROR: test_comparison ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/version.py", line 107, in test_comparison self.assert_version_is_equal("0.1.2", "0.1.2.0") File "/home/atagar/Desktop/stem/test/data/python3/test/unit/version.py", line 252, in assert_version_is_equal self.assertEqual(version1, version2) File "/usr/lib/python3.2/unittest/case.py", line 643, in assertEqual assertion_func(first, second, msg=msg) File "/usr/lib/python3.2/unittest/case.py", line 633, in _baseAssertEqual if not first == second: File "/home/atagar/Desktop/stem/test/data/python3/stem/version.py", line 214, in __eq__ return self._compare(other, lambda s, o: s == o) File "/home/atagar/Desktop/stem/test/data/python3/stem/version.py", line 197, in _compare my_version = max(0, self.__dict__[attr]) TypeError: unorderable types: NoneType() > int() --- stem/version.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stem/version.py b/stem/version.py index 46ed394..a7c816c 100644 --- a/stem/version.py +++ b/stem/version.py @@ -194,8 +194,14 @@ class Version(object): return False for attr in ("major", "minor", "micro", "patch"): - my_version = max(0, self.__dict__[attr]) - other_version = max(0, other.__dict__[attr]) + my_version = getattr(self, attr) + other_version = getattr(other, attr) + + if my_version is None: + my_version = 0 + + if other_version is None: + other_version = 0 if my_version != other_version: return method(my_version, other_version)

1 0

[stem/master] Python 3 can't do comparison with other types
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit b96f434623cd829dc8e143e1e685167facad4e22 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 12:51:57 2013 -0800 Python 3 can't do comparison with other types Another change in python 2 => 3 is that comparison ('<' and '>') can no longer work with None, ints, and other types... In python 2: >>> 5 > None True In python 3: >>> 5 > None Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: unorderable types: int() > NoneType() I expected the 'unorderable types' error would cause it to use the Version's comparison function but evidently that's not the case. Rather, when using python 3 callers need to check the values' type first (there's nothing we can do to make the comparison work). Personally I think that this is pretty stupid, but that's the workaround done by python devs on... http://bugs.python.org/issue13545 Oh well. Dropping the test that comparison with None and ints work. ====================================================================== ERROR: test_nonversion_comparison ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/version.py", line 125, in test_nonversion_comparison self.assertTrue(test_version > None) TypeError: unorderable types: Version() > NoneType() ---------------------------------------------------------------------- Ran 9 tests in 0.043s --- test/unit/version.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/version.py b/test/unit/version.py index eee4d0c..068492a 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -118,14 +118,14 @@ class TestVersion(unittest.TestCase): def test_nonversion_comparison(self): """ Checks that we can be compared with other types. + + In python 3 on only equality comparisons work, greater than and less than + comparisons result in a TypeError. """ test_version = Version("0.1.2.3") self.assertNotEqual(test_version, None) - self.assertTrue(test_version > None) - self.assertNotEqual(test_version, 5) - self.assertTrue(test_version > 5) def test_string(self): """

1 0

[stem/master] Dropping direct __dict__ usage
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit cc3f1be711665ab203f8a657a8400e2828bb9aef Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 13:41:01 2013 -0800 Dropping direct __dict__ usage Using an object's __dict__ attribute is generally thought to be a bad idea, and indeed it bites us from time to time. Functions like hasattr(), getattr(), setattr(), and vars() makes direct __dict__ usage unnecessary. This also fixes a python 3 mocking issue... ====================================================================== ERROR: test_examples ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/descriptor/networkstatus/document_v3.py", line 129, in test_examples with support_with(io.StringIO(content)) as consensus_file: File "/home/atagar/Desktop/stem/test/data/python3/test/mocking.py", line 303, in support_with obj.__dict__["__enter__"] = return_value(obj) AttributeError: '_io.StringIO' object has no attribute '__dict__' --- stem/util/enum.py | 6 ++-- test/mocking.py | 28 ++++++++++++++------------ test/unit/descriptor/router_status_entry.py | 4 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/stem/util/enum.py b/stem/util/enum.py index 9614ee8..4f6d59a 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -80,7 +80,7 @@ class Enum(object): keys.append(key) values.append(val) - self.__dict__[key] = val + setattr(self, key, val) self._keys = tuple(keys) self._values = tuple(values) @@ -156,8 +156,8 @@ class Enum(object): :raises: **ValueError** if the key doesn't exist """ - if item in self.__dict__: - return self.__dict__[item] + if item in vars(self): + return getattr(self, item) else: keys = ", ".join(self.keys()) raise ValueError("'%s' isn't among our enumeration keys, which includes: %s" % (item, keys)) diff --git a/test/mocking.py b/test/mocking.py index c2baffb..ea88992 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -300,8 +300,12 @@ def support_with(obj): :returns: input object """ - obj.__dict__["__enter__"] = return_value(obj) - obj.__dict__["__exit__"] = no_op() + if not hasattr(obj, "__enter__"): + setattr(obj, "__enter__", return_value(obj)) + + if not hasattr(obj, "__exit__"): + setattr(obj, "__exit__", no_op()) + return obj @@ -320,9 +324,9 @@ def mock(target, mock_call, target_module=None): :param module target_module: module that this is mocking, this defaults to the inspected value """ - if hasattr(target, "__dict__") and "mock_id" in target.__dict__: + if hasattr(target, "mock_id"): # we're overriding an already mocked function - mocking_id = target.__dict__["mock_id"] + mocking_id = getattr(target, "mock_id") target_module, target_function, _ = MOCK_STATE[mocking_id] else: # this is a new mocking, save the original state @@ -332,13 +336,11 @@ def mock(target, mock_call, target_module=None): MOCK_STATE[mocking_id] = (target_module, target_function, target) mock_wrapper = lambda *args, **kwargs: mock_call(*args, **kwargs) - mock_wrapper.__dict__["mock_id"] = mocking_id + setattr(mock_wrapper, "mock_id", mocking_id) # mocks the function with this wrapper - if hasattr(target, "__dict__"): - target_module.__dict__[target_function] = mock_wrapper - else: - setattr(target_module, target.__name__, mock_call) + + setattr(target_module, target_function, mock_wrapper) def mock_method(target_class, method_name, mock_call): @@ -371,7 +373,7 @@ def mock_method(target_class, method_name, mock_call): target_method = getattr(target_class, method_name) - if "mock_id" in target_method.__dict__: + if hasattr(target_method, "mock_id"): # we're overriding an already mocked method mocking_id = target_method.mock_id _, target_method, _ = MOCK_STATE[mocking_id] @@ -431,8 +433,8 @@ def get_real_function(function): :returns: original implementation of the function """ - if "mock_id" in function.__dict__: - mocking_id = function.__dict__["mock_id"] + if hasattr(function, "mock_id"): + mocking_id = getattr(function, "mock_id") return MOCK_STATE[mocking_id][2] else: return function @@ -545,7 +547,7 @@ def get_protocolinfo_response(**attributes): stem.response.convert("PROTOCOLINFO", protocolinfo_response) for attr in attributes: - protocolinfo_response.__dict__[attr] = attributes[attr] + setattr(protocolinfo_response, attr, attributes[attr]) return protocolinfo_response diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 3f27663..21795f2 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -477,8 +477,8 @@ class TestRouterStatusEntry(unittest.TestCase): # we need a document that's a vote mock_document = lambda x: x # just need anything with a __dict__ - mock_document.__dict__["is_vote"] = True - mock_document.__dict__["is_consensus"] = False + setattr(mock_document, "is_vote", True) + setattr(mock_document, "is_consensus", False) for m_line, expected in test_values.items(): content = get_router_status_entry_v3({'m': m_line}, content = True)

1 0

[stem/master] Using byte string for binascii.a2b_hex in python 3
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit e6e5005b8afd9b7e0a1239a92d7c7a3f39e3ef42 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 12:28:59 2013 -0800 Using byte string for binascii.a2b_hex in python 3 Like base64.b64decode(), binascii.a2b_hex() expects a byte string. ====================================================================== ERROR: test_valid_response ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/response/authchallenge.py", line 31, in test_valid_response stem.response.convert("AUTHCHALLENGE", control_message) File "/home/atagar/Desktop/stem/test/data/python3/stem/response/__init__.py", line 117, in convert message._parse_message(**kwargs) File "/home/atagar/Desktop/stem/test/data/python3/stem/response/authchallenge.py", line 40, in _parse_message self.server_hash = binascii.a2b_hex(value) TypeError: 'str' does not support the buffer interface ---------------------------------------------------------------------- Ran 2 tests in 0.009s --- stem/connection.py | 7 ++++--- stem/response/authchallenge.py | 5 +++-- test/unit/response/authchallenge.py | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 01da5b8..86d73d6 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -110,6 +110,7 @@ import stem.response import stem.socket import stem.util.connection import stem.util.enum +import stem.util.str_tools import stem.util.system import stem.version @@ -582,7 +583,7 @@ def authenticate_cookie(controller, cookie_path, suppress_ctl_errors = True): cookie_data = _read_cookie(cookie_path, False) try: - msg = "AUTHENTICATE %s" % binascii.b2a_hex(cookie_data) + msg = "AUTHENTICATE %s" % binascii.b2a_hex(stem.util.str_tools.to_bytes(cookie_data)) auth_response = _msg(controller, msg) # if we got anything but an OK response then error @@ -677,7 +678,7 @@ def authenticate_safecookie(controller, cookie_path, suppress_ctl_errors = True) client_nonce = os.urandom(32) try: - client_nonce_hex = binascii.b2a_hex(client_nonce) + client_nonce_hex = binascii.b2a_hex(stem.util.str_tools.to_bytes(client_nonce)) authchallenge_response = _msg(controller, "AUTHCHALLENGE SAFECOOKIE %s" % client_nonce_hex) if not authchallenge_response.is_ok(): @@ -729,7 +730,7 @@ def authenticate_safecookie(controller, cookie_path, suppress_ctl_errors = True) CLIENT_HASH_CONSTANT, cookie_data + client_nonce + authchallenge_response.server_nonce) - auth_response = _msg(controller, "AUTHENTICATE %s" % (binascii.b2a_hex(client_hash))) + auth_response = _msg(controller, "AUTHENTICATE %s" % (binascii.b2a_hex(stem.util.str_tools.to_bytes(client_hash)))) except stem.ControllerError, exc: try: controller.connect() diff --git a/stem/response/authchallenge.py b/stem/response/authchallenge.py index 5063b79..58bc48d 100644 --- a/stem/response/authchallenge.py +++ b/stem/response/authchallenge.py @@ -2,6 +2,7 @@ import binascii import stem.response import stem.socket +import stem.util.str_tools import stem.util.tor_tools @@ -37,7 +38,7 @@ class AuthChallengeResponse(stem.response.ControlMessage): if not stem.util.tor_tools.is_hex_digits(value, 64): raise stem.ProtocolError("SERVERHASH has an invalid value: %s" % value) - self.server_hash = binascii.a2b_hex(value) + self.server_hash = binascii.a2b_hex(stem.util.str_tools.to_bytes(value)) else: raise stem.ProtocolError("Missing SERVERHASH mapping: %s" % line) @@ -47,6 +48,6 @@ class AuthChallengeResponse(stem.response.ControlMessage): if not stem.util.tor_tools.is_hex_digits(value, 64): raise stem.ProtocolError("SERVERNONCE has an invalid value: %s" % value) - self.server_nonce = binascii.a2b_hex(value) + self.server_nonce = binascii.a2b_hex(stem.util.str_tools.to_bytes(value)) else: raise stem.ProtocolError("Missing SERVERNONCE mapping: %s" % line) diff --git a/test/unit/response/authchallenge.py b/test/unit/response/authchallenge.py index a958322..5cdf347 100644 --- a/test/unit/response/authchallenge.py +++ b/test/unit/response/authchallenge.py @@ -14,8 +14,8 @@ VALID_RESPONSE = "250 AUTHCHALLENGE \ SERVERHASH=B16F72DACD4B5ED1531F3FCC04B593D46A1E30267E636EA7C7F8DD7A2B7BAA05 \ SERVERNONCE=653574272ABBB49395BD1060D642D653CFB7A2FCE6A4955BCFED819703A9998C" -VALID_HASH = "\xb1or\xda\xcdK^\xd1S\x1f?\xcc\x04\xb5\x93\xd4j\x1e0&~cn\xa7\xc7\xf8\xddz+{\xaa\x05" -VALID_NONCE = "e5t'*\xbb\xb4\x93\x95\xbd\x10`\xd6B\xd6S\xcf\xb7\xa2\xfc\xe6\xa4\x95[\xcf\xed\x81\x97\x03\xa9\x99\x8c" +VALID_HASH = b"\xb1or\xda\xcdK^\xd1S\x1f?\xcc\x04\xb5\x93\xd4j\x1e0&~cn\xa7\xc7\xf8\xddz+{\xaa\x05" +VALID_NONCE = b"e5t'*\xbb\xb4\x93\x95\xbd\x10`\xd6B\xd6S\xcf\xb7\xa2\xfc\xe6\xa4\x95[\xcf\xed\x81\x97\x03\xa9\x99\x8c" INVALID_RESPONSE = "250 AUTHCHALLENGE \ SERVERHASH=FOOBARB16F72DACD4B5ED1531F3FCC04B593D46A1E30267E636EA7C7F8DD7A2B7BAA05 \ SERVERNONCE=FOOBAR653574272ABBB49395BD1060D642D653CFB7A2FCE6A4955BCFED819703A9998C"

1 0

[stem/master] NetworkStatus' meets_consensus_method() comparisons didn't account for None
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit de9ac90b6db59f29a42453b829a66dff7b3b1767 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 27 13:17:48 2013 -0800 NetworkStatus' meets_consensus_method() comparisons didn't account for None Another spot where comparison with None fails with python 3... ====================================================================== ERROR: test_with_directory_authorities ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/unit/descriptor/networkstatus/document_v3.py", line 800, in test_with_directory_authorities document = NetworkStatusDocumentV3(content) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/networkstatus.py", line 509, in __init__ self._footer = _DocumentFooter(document_file, validate, self._header) File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/networkstatus.py", line 776, in __init__ if header.meets_consensus_method(9): File "/home/atagar/Desktop/stem/test/data/python3/stem/descriptor/networkstatus.py", line 581, in meets_consensus_method return bool(self.consensus_method >= method or [x for x in self.consensus_methods if x >= method]) TypeError: unorderable types: NoneType() >= int() --- stem/descriptor/networkstatus.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index f17d705..b4bc188 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -578,7 +578,12 @@ class _DocumentHeader(object): _check_for_misordered_fields(entries, HEADER_FIELDS) def meets_consensus_method(self, method): - return bool(self.consensus_method >= method or filter(lambda x: x >= method, self.consensus_methods)) + if self.consensus_method is not None: + return self.consensus_method >= method + elif self.consensus_methods is not None: + return bool(filter(lambda x: x >= method, self.consensus_methods)) + else: + return False # malformed document def _parse(self, entries, validate): for keyword, values in entries.items():

1 0