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

[stem/master] Replacing file() with open()
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 384411b26dd140e3d4b181f3c2b1a48057238096 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 1 07:16:25 2013 -0800 Replacing file() with open() I'm not sure why we were using file() at one point rather than open(), but it makes python 3 sad... ====================================================================== ERROR: test_authenticate_cookie ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/integ/connection/authentication.py", line 303, in test_authenticate_cookie self._check_auth(auth_type, auth_value) File "/home/atagar/Desktop/stem/test/data/python3/test/integ/connection/authentication.py", line 400, in _check_auth stem.connection.authenticate_cookie(control_socket, auth_arg) File "/home/atagar/Desktop/stem/test/data/python3/stem/connection.py", line 583, in authenticate_cookie cookie_data = _read_cookie(cookie_path, False) File "/home/atagar/Desktop/stem/test/data/python3/stem/connection.py", line 877, in _read_cookie with file(cookie_path, 'rb', 0) as f: NameError: global name 'file' is not defined --- stem/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 86d73d6..1a72399 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -874,7 +874,7 @@ def _read_cookie(cookie_path, is_safecookie): raise IncorrectCookieSize(exc_msg, cookie_path, is_safecookie) try: - with file(cookie_path, 'rb', 0) as f: + with open(cookie_path, 'rb', 0) as f: return f.read() except IOError, exc: exc_msg = "Authentication failed: unable to read '%s' (%s)" % (cookie_path, exc)

1 0

[stem/master] Accounting for ascii/unicode for network status documents
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit a047a74abef0dc9fedf463c093c14defe958d81b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 1 07:12:04 2013 -0800 Accounting for ascii/unicode for network status documents Woohoo! Last descriptor type. Unlike the other descriptor types callers are encouraged to sometimes use our NetworkStatusDocument classes directly so swapping the input to unicode if we get ascii. With this all of the descriptor integ tests now pass with python 3! --- stem/descriptor/networkstatus.py | 3 +++ test/integ/descriptor/networkstatus.py | 16 ++++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 69f1a44..0d60de1 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -73,6 +73,7 @@ import StringIO import stem.descriptor import stem.descriptor.router_status_entry +import stem.util.str_tools import stem.util.tor_tools import stem.version @@ -274,6 +275,7 @@ class NetworkStatusDocumentV2(NetworkStatusDocument): """ def __init__(self, raw_content, validate = True): + raw_content = stem.util.str_tools.to_unicode(raw_content) super(NetworkStatusDocumentV2, self).__init__(raw_content) self.version = None @@ -471,6 +473,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :raises: **ValueError** if the document is invalid """ + raw_content = stem.util.str_tools.to_unicode(raw_content) super(NetworkStatusDocumentV3, self).__init__(raw_content) document_file = StringIO.StringIO(raw_content) diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index df676b4..3f758b4 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -43,9 +43,7 @@ class TestNetworkStatus(unittest.TestCase): count = 0 with open(consensus_path, 'rb') as descriptor_file: - document_type = stem.descriptor.networkstatus.NetworkStatusDocumentV3 - - for router in stem.descriptor.networkstatus._parse_file(descriptor_file, document_type): + for router in stem.descriptor.parse_file(descriptor_file, "network-status-consensus-3 1.0", path = consensus_path): count += 1 # We should have constant memory usage. Fail if we're using over 200 MB. @@ -90,9 +88,7 @@ class TestNetworkStatus(unittest.TestCase): count = 0 with open(consensus_path, 'rb') as descriptor_file: - document_type = stem.descriptor.networkstatus.NetworkStatusDocumentV3 - - for router in stem.descriptor.networkstatus._parse_file(descriptor_file, document_type, is_microdescriptor = True): + for router in stem.descriptor.parse_file(descriptor_file, "network-status-microdesc-consensus-3 1.0", path = consensus_path): count += 1 if resource.getrusage(resource.RUSAGE_SELF).ru_maxrss > 200000: @@ -143,9 +139,7 @@ class TestNetworkStatus(unittest.TestCase): consensus_path = get_resource("bridge_network_status") with open(consensus_path, 'rb') as descriptor_file: - descriptors = stem.descriptor.parse_file(descriptor_file, path = consensus_path) - - router = next(descriptors) + router = next(stem.descriptor.parse_file(descriptor_file, path = consensus_path)) self.assertEquals("Unnamed", router.nickname) self.assertEquals("0014A2055278DB3EB0E59EA701741416AF185558", router.fingerprint) self.assertEquals("FI74aFuNJZZQrgln0f+OaocMd0M", router.digest) @@ -191,9 +185,7 @@ GM9hAsAMRX9Ogqhq5UjDNqEsvDKuyVeyh7unSZEOip9Zr6K/+7VsVPNb8vfBRBjo cert_path = get_resource("metrics_cert") with open(cert_path) as cert_file: - certs = stem.descriptor.parse_file(cert_file, path = cert_path) - - cert = next(certs) + cert = next(stem.descriptor.parse_file(cert_file, path = cert_path)) self.assertEquals(3, cert.version) self.assertEquals(None, cert.address) self.assertEquals(None, cert.dir_port)

1 0

[stem/master] Converting cookie auth token to unicode
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 2b2a645ac778570d99961f9b9592769fdc9caa10 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 1 07:48:21 2013 -0800 Converting cookie auth token to unicode Well, this is dumb. Making a formatted string with ascii bytes includes the b'' wrapper in python 3. This broke our authentication calls, making calls like... AUTHENTICATE b'd55e81eb9c3a1e22a2db919ec2efd22df4aeb88ee0ab3d10e64dbb2450d06921' Converting the token to unicode to avoid this. ====================================================================== ERROR: test_authenticate_cookie ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/integ/connection/authentication.py", line 400, in _check_auth stem.connection.authenticate_cookie(control_socket, auth_arg) File "/home/atagar/Desktop/stem/test/data/python3/stem/connection.py", line 604, in authenticate_cookie raise CookieAuthRejected(str(auth_response), cookie_path, False, auth_response) stem.connection.CookieAuthRejected: Invalid hexadecimal encoding. Maybe you tried a plain text password? If so, the standard requires that you put it in double quotes. During handling of the above exception, another exception occurred: Traceback: File "/home/atagar/Desktop/stem/test/data/python3/test/integ/connection/authentication.py", line 303, in test_authenticate_cookie self._check_auth(auth_type, auth_value) File "/home/atagar/Desktop/stem/test/data/python3/test/integ/connection/authentication.py", line 411, in _check_auth failure_msg = _get_auth_failure_message(auth_type) File "/home/atagar/Desktop/stem/test/data/python3/test/integ/connection/authentication.py", line 99, in _get_auth_failure_message raise ValueError("No methods of authentication. If this is an open socket then auth shouldn't fail.") ValueError: No methods of authentication. If this is an open socket then auth shouldn't fail. --- stem/connection.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 1a72399..a581c99 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -583,7 +583,18 @@ def authenticate_cookie(controller, cookie_path, suppress_ctl_errors = True): cookie_data = _read_cookie(cookie_path, False) try: - msg = "AUTHENTICATE %s" % binascii.b2a_hex(stem.util.str_tools.to_bytes(cookie_data)) + # binascii.b2a_hex() takes a byte string and returns one too. With python 3 + # this is a problem because string formatting for byte strings includes the + # b'' wrapper... + # + # >>> "AUTHENTICATE %s" % b'content' + # "AUTHENTICATE b'content'" + # + # This seems dumb but oh well. Converting the result to unicode so it won't + # misbehave. + + auth_token_hex = binascii.b2a_hex(stem.util.str_tools.to_bytes(cookie_data)) + msg = "AUTHENTICATE %s" % stem.util.str_tools.to_unicode(auth_token_hex) auth_response = _msg(controller, msg) # if we got anything but an OK response then error

1 0

[stem/master] Pydoc missing version from descriptor type listing
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 284797ace4cf0b8e4469454b65809fc66c7ae1d2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 1 06:57:54 2013 -0800 Pydoc missing version from descriptor type listing The 'network-status-microdesc-consensus-3' listing was missing the '1.0'. --- stem/descriptor/__init__.py | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 788b442..0a7ee07 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -64,24 +64,24 @@ def parse_file(descriptor_file, descriptor_type = None, path = None, validate = Descriptor types include the following, including further minor versions (ie. if we support 1.0 then we also support 1.1 and above)... - ===================================== ===== - Descriptor Type Class - ===================================== ===== - server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.RelayDescriptor` - extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor` - directory 1.0 **unsupported** - network-status-2 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV2` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV2`) - dir-key-certificate-3 1.0 :class:`~stem.descriptor.networkstatus.KeyCertificate` - network-status-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) - network-status-vote-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) - network-status-microdesc-consensus-3 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) - bridge-network-status 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.BridgeNetworkStatusDocument`) - bridge-server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` - bridge-extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` - torperf 1.0 **unsupported** - bridge-pool-assignment 1.0 **unsupported** - tordnsel 1.0 **unsupported** - ===================================== ===== + ========================================= ===== + Descriptor Type Class + ========================================= ===== + server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.RelayDescriptor` + extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor` + directory 1.0 **unsupported** + network-status-2 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV2` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV2`) + dir-key-certificate-3 1.0 :class:`~stem.descriptor.networkstatus.KeyCertificate` + network-status-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) + network-status-vote-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) + network-status-microdesc-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) + bridge-network-status 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.BridgeNetworkStatusDocument`) + bridge-server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` + bridge-extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` + torperf 1.0 **unsupported** + bridge-pool-assignment 1.0 **unsupported** + tordnsel 1.0 **unsupported** + ========================================= ===== If you're using **python 3** then beware of the open() function's universal newline translation. By default open() converts all common line endings (NL,

1 0

[stem/master] Python 3.x support
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 3930f1f1eda99bcf22fe574b95665f8ef47ffdc4 Merge: 7921a46 2b2a645 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 2 10:12:02 2013 -0800 Python 3.x support Adding support for the python 3.x series. You can install the python 3 version of stem by running... python3 setup.py install The 2to3 conversion can be tested trough run_tests.py with the '--python3' argument. It passes all of the unit tests and the integ tests... er, don't technically fail. However, python 3.2 has a bug causing a segfault when it gets to the BaseController integ tests. Filed a ticket about it... http://bugs.python.org/issue17105 However, stem's descriptor functionality checks out and this issue has likely been addressed in later python releases so there's little point to hold off on merging. Ticket for python 3 support... https://trac.torproject.org/7843 run_tests.py | 163 +++++++++++++++++++------ stem/__init__.py | 4 +- stem/connection.py | 20 +++- stem/descriptor/__init__.py | 107 ++++++++++++++--- stem/descriptor/extrainfo_descriptor.py | 13 +- stem/descriptor/networkstatus.py | 82 ++++++++++--- stem/descriptor/reader.py | 12 ++- stem/descriptor/router_status_entry.py | 69 ++++++++--- stem/descriptor/server_descriptor.py | 49 +++++--- stem/exit_policy.py | 6 +- stem/prereq.py | 25 +++-- stem/process.py | 9 ++- stem/response/authchallenge.py | 5 +- stem/response/events.py | 4 +- stem/socket.py | 19 +++- stem/util/connection.py | 4 +- stem/util/enum.py | 10 +- stem/util/str_tools.py | 58 +++++++++ stem/util/system.py | 7 +- stem/util/tor_tools.py | 6 +- stem/version.py | 40 ++++--- test/check_whitespace.py | 16 ++- test/integ/descriptor/__init__.py | 8 +- test/integ/descriptor/extrainfo_descriptor.py | 26 ++--- test/integ/descriptor/networkstatus.py | 50 +++----- test/integ/descriptor/reader.py | 19 ++- test/integ/descriptor/server_descriptor.py | 71 +++-------- test/integ/util/proc.py | 6 +- test/mocking.py | 47 +++++--- test/output.py | 2 + test/settings.cfg | 6 +- test/unit/descriptor/reader.py | 36 +++--- test/unit/descriptor/router_status_entry.py | 4 +- test/unit/descriptor/server_descriptor.py | 3 +- test/unit/response/authchallenge.py | 4 +- test/unit/util/enum.py | 2 +- test/unit/util/proc.py | 18 ++- test/unit/util/system.py | 2 +- test/unit/version.py | 6 +- 39 files changed, 704 insertions(+), 334 deletions(-)

1 0

[stem/master] Dropping hardcoded python 2.x check
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 54eac73e62739cb40bced307ff6967548eb3af42 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 21 00:42:46 2013 -0800 Dropping hardcoded python 2.x check Our prereq module asserted that stem isn't compatable beyond the 2.x series. Clearly I'm trying to 'fix' that with this branch. Ideally we'd keep this check for our python 2.x codebase, and strip it when we do a 2to3 conversion. However, that's more error prone than I'd like so simply dropping the check entirely. --- stem/prereq.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/stem/prereq.py b/stem/prereq.py index 6d4b054..f80a907 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -37,9 +37,7 @@ def check_requirements(): major_version, minor_version = sys.version_info[0:2] - if major_version > 2: - raise ImportError("stem isn't compatible beyond the python 2.x series") - elif major_version < 2 or minor_version < 5: + if major_version < 2 or (major_version == 2 and minor_version < 5): raise ImportError("stem requires python version 2.5 or greater")

1 0

[stem/master] Making static checks skip the data directory
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit f9a2f147b6fe6187e3ba8d1b5bffa5efce14fac1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 21 00:18:20 2013 -0800 Making static checks skip the data directory Our static checkers (most noticeably pep8 and pyflakes) run over the test data directory. This was fine until I started using it for the python3 export. Now that it has python code these checkers have a lot to say about it, none of it helpful. Simply ignoring the output if it concerns the data directory. This is a sucky solution since pyflakes/pep8 are still running over an extra copy of our codebase, taking a noticeable bit of extra time. However, pyflakes at least lacks any options for ignoring directories. I'll probably simply move our python3 export to another location later if this annoys me. --- run_tests.py | 2 +- test/check_whitespace.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/run_tests.py b/run_tests.py index 7448999..566eb41 100755 --- a/run_tests.py +++ b/run_tests.py @@ -371,7 +371,7 @@ if __name__ == '__main__': exit_status = os.system("python3 %s %s" % (python3_runner, " ".join(sys.argv[1:]))) sys.exit(exit_status) else: - sys.exit(1) # failed to do python3 setup + sys.exit(1) # failed to do python3 setup if not CONFIG["argument.unit"] and not CONFIG["argument.integ"] and not CONFIG["argument.style"]: test.output.print_line("Nothing to run (for usage provide --help)\n") diff --git a/test/check_whitespace.py b/test/check_whitespace.py index a6a9ead..2f758b8 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -27,7 +27,8 @@ DEFAULT_TARGET = os.path.sep.join(__file__.split(os.path.sep)[:-1]) PYFLAKES_IGNORE = None CONFIG = conf.config_dict("test", { - "pyflakes.ignore": [] + "pyflakes.ignore": [], + "integ.test_directory": "./test/data", }) @@ -87,7 +88,9 @@ def pep8_issues(base_path = DEFAULT_TARGET): if line_match: path, line, _, issue = line_match.groups() - issues.setdefault(path, []).append((int(line), issue)) + + if not _is_test_data(path): + issues.setdefault(path, []).append((int(line), issue)) return issues @@ -131,7 +134,7 @@ def pyflakes_issues(base_path = DEFAULT_TARGET): if line_match: path, line, issue = line_match.groups() - if not issue in PYFLAKES_IGNORE.get(path, []): + if not _is_test_data(path) and not issue in PYFLAKES_IGNORE.get(path, []): issues.setdefault(path, []).append((int(line), issue)) return issues @@ -153,6 +156,9 @@ def get_issues(base_path = DEFAULT_TARGET): issues = {} for file_path in _get_files_with_suffix(base_path): + if _is_test_data(file_path): + continue + with open(file_path) as f: file_contents = f.read() @@ -186,6 +192,10 @@ def get_issues(base_path = DEFAULT_TARGET): return issues +def _is_test_data(path): + return os.path.normpath(path).startswith(os.path.normpath(CONFIG["integ.test_directory"])) + + def _get_files_with_suffix(base_path, suffix = ".py"): """ Iterates over files in a given directory, providing filenames with a certain

1 0

[stem/master] Python 3 testing support
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 919502c53baff9f823ed537dab86ec930cf2eaf7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 20 23:42:29 2013 -0800 Python 3 testing support Adding python 3 support to the tests. This introduces two new testing arguments... --python3 Does a 2to3 export of our codebase and tests against that. If a python3 export already exists then reuses that (... it takes an annoyingly long time to run). --clean Wipes our prior python3 export. Next to start sorting out the 2to3 conversion issues... --- run_tests.py | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- test/output.py | 2 + 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index db24c0e..7448999 100755 --- a/run_tests.py +++ b/run_tests.py @@ -6,6 +6,7 @@ Runs unit and integration tests. For usage information run this with '--help'. import getopt import os +import shutil import StringIO import sys import threading @@ -71,13 +72,15 @@ import test.integ.util.system import test.integ.version OPT = "auist:l:c:h" -OPT_EXPANDED = ["all", "unit", "integ", "style", "targets=", "test=", "log=", "tor=", "config=", "help"] +OPT_EXPANDED = ["all", "unit", "integ", "style", "python3", "clean", "targets=", "test=", "log=", "tor=", "config=", "help"] DIVIDER = "=" * 70 CONFIG = stem.util.conf.config_dict("test", { "argument.unit": False, "argument.integ": False, "argument.style": False, + "argument.python3": False, + "argument.python3_clean": False, "argument.test": "", "argument.log": None, "argument.tor": "tor", @@ -87,6 +90,7 @@ CONFIG = stem.util.conf.config_dict("test", { "target.description": {}, "target.prereq": {}, "target.torrc": {}, + "integ.test_directory": "./test/data", }) Target = stem.util.enum.UppercaseEnum( @@ -199,6 +203,10 @@ def load_user_configuration(test_config): arg_overrides["argument.integ"] = "true" elif opt in ("-s", "--style"): arg_overrides["argument.style"] = "true" + elif opt == "--python3": + arg_overrides["argument.python3"] = "true" + elif opt == "--clean": + arg_overrides["argument.python3_clean"] = "true" elif opt in ("-c", "--config"): config_path = os.path.abspath(arg) elif opt in ("-t", "--targets"): @@ -281,6 +289,55 @@ def _clean_orphaned_pyc(): test.output.print_line(" removing %s" % pyc_file, *test.runner.ERROR_ATTR) os.remove(pyc_file) + +def _python3_setup(python3_destination): + # Python 2.7.3 added some nice capabilities to 2to3, like '--output-dir'... + # + # http://docs.python.org/2/library/2to3.html + # + # ... but I'm using 2.7.1, and it's pretty easy to make it work without + # requiring a bleeding edge interpretor. + + test.output.print_divider("EXPORTING TO PYTHON 3", True) + + if CONFIG["argument.python3_clean"]: + shutil.rmtree(python3_destination, ignore_errors = True) + + if os.path.exists(python3_destination): + test.output.print_line("Reusing '%s'. Run again with '--clean' if you want to recreate the python3 export." % python3_destination, *test.runner.ERROR_ATTR) + print + return True + + os.makedirs(python3_destination) + + try: + # skips the python3 destination (to avoid an infinite loop) + def _ignore(src, names): + if src == os.path.normpath(python3_destination): + return names + else: + return [] + + test.output.print_noline(" copying stem to '%s'... " % python3_destination, *test.runner.STATUS_ATTR) + shutil.copytree('stem', os.path.join(python3_destination, 'stem')) + shutil.copytree('test', os.path.join(python3_destination, 'test'), ignore = _ignore) + shutil.copy('run_tests.py', os.path.join(python3_destination, 'run_tests.py')) + test.output.print_line("done", *test.runner.STATUS_ATTR) + except OSError, exc: + test.output.print_line("failed\n%s" % exc, *test.runner.ERROR_ATTR) + return False + + try: + test.output.print_noline(" running 2to3... ", *test.runner.STATUS_ATTR) + system.call("2to3 --write --nobackups --no-diffs %s" % python3_destination) + test.output.print_line("done", *test.runner.STATUS_ATTR) + except OSError, exc: + test.output.print_line("failed\n%s" % exc, *test.runner.ERROR_ATTR) + return False + + return True + + if __name__ == '__main__': try: stem.prereq.check_requirements() @@ -306,6 +363,16 @@ if __name__ == '__main__': load_user_configuration(test_config) + if CONFIG["argument.python3"] and sys.version_info.major != 3: + python3_destination = os.path.join(CONFIG["integ.test_directory"], "python3") + + if _python3_setup(python3_destination): + python3_runner = os.path.join(python3_destination, "run_tests.py") + exit_status = os.system("python3 %s %s" % (python3_runner, " ".join(sys.argv[1:]))) + sys.exit(exit_status) + else: + sys.exit(1) # failed to do python3 setup + if not CONFIG["argument.unit"] and not CONFIG["argument.integ"] and not CONFIG["argument.style"]: test.output.print_line("Nothing to run (for usage provide --help)\n") sys.exit() diff --git a/test/output.py b/test/output.py index 160b10f..e3b9daf 100644 --- a/test/output.py +++ b/test/output.py @@ -47,8 +47,10 @@ def print_line(msg, *attr): def print_noline(msg, *attr): if CONFIG["argument.no_color"]: sys.stdout.write(msg) + sys.stdout.flush() else: sys.stdout.write(term.format(msg, *attr)) + sys.stdout.flush() def print_divider(msg, is_header = False):

1 0

[stem/master] Making the Enum's keys() method provide a list
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 77b6fa86df045298564b1c0b9f66bd3d71d66d2e Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 21 00:36:24 2013 -0800 Making the Enum's keys() method provide a list The 2to3 converter is evidently confused because we have a keys() method that provides a tuple rather than a list. Dictionaries provide lists via their keys() method so there's probably not a terribly compelling reason for us to do differently. --- stem/__init__.py | 4 ++-- stem/util/enum.py | 4 ++-- test/unit/util/enum.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index a4bbdbd..ae72ab8 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -632,10 +632,10 @@ StreamStatus = stem.util.enum.UppercaseEnum( ) # StreamClosureReason is a superset of RelayEndReason -StreamClosureReason = stem.util.enum.UppercaseEnum(*(RelayEndReason.keys() + ( +StreamClosureReason = stem.util.enum.UppercaseEnum(*(RelayEndReason.keys() + [ "END", "PRIVATE_ADDR", -))) +])) StreamSource = stem.util.enum.UppercaseEnum( "CACHE", diff --git a/stem/util/enum.py b/stem/util/enum.py index 9e36c4d..9614ee8 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -89,10 +89,10 @@ class Enum(object): """ Provides an ordered listing of the enumeration keys in this set. - :returns: **tuple** with our enum keys + :returns: **list** with our enum keys """ - return self._keys + return list(self._keys) def index_of(self, value): """ diff --git a/test/unit/util/enum.py b/test/unit/util/enum.py index 1f199c3..0e562b3 100644 --- a/test/unit/util/enum.py +++ b/test/unit/util/enum.py @@ -46,4 +46,4 @@ class TestEnum(unittest.TestCase): self.assertEquals(insects.LADYBUG, insects.previous(insects.FIREFLY)) # keys method - self.assertEquals(("ANT", "WASP", "LADYBUG", "FIREFLY"), insects.keys()) + self.assertEquals(["ANT", "WASP", "LADYBUG", "FIREFLY"], insects.keys())

1 0

[stem/master] Adding is_python_3() to prereq module
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 84df4318abce565fd2f682ee6e12ea2fe9acf072 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 21 08:56:35 2013 -0800 Adding is_python_3() to prereq module Something tells me that we'll need this... --- stem/prereq.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/stem/prereq.py b/stem/prereq.py index f80a907..b0a508e 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -16,6 +16,7 @@ series). Other requirements for complete functionality are... is_python_26 - checks if python 2.6 or later is available is_python_27 - checks if python 2.7 or later is available + is_python_3 - checks if python 3.0 or later is available is_rsa_available - checks if the rsa module is available """ @@ -61,6 +62,16 @@ def is_python_27(): return _check_version(7) +def is_python_3(): + """ + Checks if we're in the 3.0 - 3.x range. + + :returns: bool that is True if we meet this requirement and False otherwise + """ + + return sys.version_info[0] == 3 + + def is_crypto_available(): global IS_CRYPTO_AVAILABLE

1 0