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

[stem/master] Making get_process_name()'s ps lookup work on OSX
by atagar＠torproject.org 18 Feb '13

18 Feb '13

commit bdbb508ae2ffcaa5480992d33c28ec52a6e61b7e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 17 20:34:11 2013 -0800 Making get_process_name()'s ps lookup work on OSX The get_process_name() function uses a couple approaches to determine our process name, the first being to query ps. This tends to work pretty well across various platforms (barring Windows, of course), but there's a slight difference in the header on OSX/BSD. Accounting for this... Example ps output: stem git:(master) : ps -p 60437 -o args ARGS tor --socksport 9050 Caught by Sathyanarayanan on... https://trac.torproject.org/8266 --- stem/util/system.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 46aead2..0a42881 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -707,7 +707,7 @@ def get_process_name(): ps_output = call("ps -p %i -o args" % os.getpid(), []) - if len(ps_output) == 2 and ps_output[0] == "COMMAND": + if len(ps_output) == 2 and ps_output[0] in ("COMMAND", "ARGS"): _PROCESS_NAME = ps_output[1] else: # Falling back on using ctypes to get our argv. Unfortunately the simple

1 0

[stem/master] Accounting for NULL access by ctypes
by atagar＠torproject.org 18 Feb '13

18 Feb '13

commit 08529723708ed514f6f5e2489d3c1be8c0e9ae36 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 17 18:09:58 2013 -0800 Accounting for NULL access by ctypes Evidently accessing argc can raise a ValueError... https://trac.torproject.org/8266 --- stem/util/system.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index c35e22f..46aead2 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -722,7 +722,15 @@ def get_process_name(): args, argc = [], argc_t() for i in xrange(100): - if argc[i] is None: + # The ending index can be either None or raise a ValueError when + # accessed... + # + # ValueError: NULL pointer access + + try: + if argc[i] is None: + break + except ValueError: break args.append(str(argc[i]))

1 0

[stem/master] Cleaning up our TODO comments
by atagar＠torproject.org 17 Feb '13

17 Feb '13

commit 4a2e7e74652c2c93654035bede41f203397ed16b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 17 12:25:43 2013 -0800 Cleaning up our TODO comments Several of our TODO comments were no longer relevant or could be expanded. --- stem/control.py | 16 +++++++--------- stem/descriptor/extrainfo_descriptor.py | 6 ++---- stem/response/getconf.py | 2 +- stem/util/system.py | 4 ---- test/unit/response/protocolinfo.py | 2 -- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/stem/control.py b/stem/control.py index 5c7a54e..d799922 100644 --- a/stem/control.py +++ b/stem/control.py @@ -662,15 +662,6 @@ class Controller(BaseController): self._event_listeners = {} self._event_listeners_lock = threading.RLock() - # TODO: We want the capability of taking post-authentication actions, for - # instance to call SETEVENTS so our event listeners will work on new - # connections. The trouble is that the user could do this by a variety of - # methods (authenticate(), msg(), stem.connection.authenticete(), etc)... - # - # When we get it figured out we should add the pydoc comment: - # If a new control connection is initialized then this listener will be - # reattached. - # number of sequential 'GETINFO ip-to-country/*' lookups that have failed self._geoip_failure_count = 0 self._enabled_features = [] @@ -1020,6 +1011,8 @@ class Controller(BaseController): try: # TODO: We should iterate over the descriptors as they're read from the # socket rather than reading the whole thing into memory. + # + # https://trac.torproject.org/8248 desc_content = self.get_info("desc/all-recent") @@ -1087,6 +1080,8 @@ class Controller(BaseController): try: # TODO: We should iterate over the descriptors as they're read from the # socket rather than reading the whole thing into memeory. + # + # https://trac.torproject.org/8248 desc_content = self.get_info("ns/all") @@ -1423,6 +1418,9 @@ class Controller(BaseController): controller.add_event_listener(print_bw, EventType.BW) time.sleep(5) + If a new control connection is initialized then this listener will be + reattached. + :param functor listener: function to be called when an event is received :param stem.control.EventType events: event types to be listened for diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index c64550c..10bd6fd 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -602,10 +602,8 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): if value: for entry in value.split(","): try: - # TODO: The description of the values sound like they should - # always be positive, but this is not always the case in - # practice... - # https://trac.torproject.org/projects/tor/ticket/5849 + # Values should be positive but as discussed in ticket #5849 + # there was a bug around this. It was fixed in tor 0.2.2.1. entries.append(float(entry)) except ValueError: diff --git a/stem/response/getconf.py b/stem/response/getconf.py index ce3a2ad..5d32582 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -41,7 +41,7 @@ class GetConfResponse(stem.response.ControlMessage): line = remaining_lines.pop(0) if line.is_next_mapping(quoted = False): - key, value = line.split("=", 1) # TODO: make this part of the ControlLine? + key, value = line.split("=", 1) elif line.is_next_mapping(quoted = True): # TODO: doesn't seem to occur yet in practice... # https://trac.torproject.org/6172 diff --git a/stem/util/system.py b/stem/util/system.py index 3a11161..bc598b1 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -401,10 +401,6 @@ def get_pid_by_port(port): # p - only includes results if the local or foreign port match this # # example output: - # # TODO: We need an example for the actual command we're using. I'm - # # suspecting that replacing the grep with checking the local port works, - # # but should double check. - # # # sockstat -4 | grep tor # _tor tor 4397 7 tcp4 51.64.7.84:9050 *:* # _tor tor 4397 8 udp4 51.64.7.84:53 *:* diff --git a/test/unit/response/protocolinfo.py b/test/unit/response/protocolinfo.py index f5ffa66..86309e7 100644 --- a/test/unit/response/protocolinfo.py +++ b/test/unit/response/protocolinfo.py @@ -151,8 +151,6 @@ class TestProtocolInfoResponse(unittest.TestCase): succeeds and fails. """ - # TODO: move into stem.connection unit tests? - # we need to mock both pid and cwd lookups since the general cookie # expanion works by... # - resolving the pid of the "tor" process

1 0

[stem/master] Adding copyright headers
by atagar＠torproject.org 17 Feb '13

17 Feb '13

commit d70a2d394f24e471379906e561d80fb47ecd2230 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 17 13:22:54 2013 -0800 Adding copyright headers Uggg I hate IP law. As pointed out by Juan on... https://trac.torproject.org/7954 ... we need copyright headers to properly comply with the requirements of being under the LGPL. I'm not looking forward to keeping this up to date (and likely won't), but oh well. I've added the header to all python source files except the unit and integ tests (patches welcome if someone wants to spend the time adding those too). These headers... * Declare a copyright from the year of the file's creation to now (2013). * Include Sean if he worked on it (he is the only contributor that hasn't made his contributions public domain to avoid copyright headaches). --- run_tests.py | 2 ++ setup.py | 2 ++ stem/__init__.py | 4 ++++ stem/connection.py | 3 +++ stem/control.py | 4 ++++ stem/descriptor/__init__.py | 4 ++++ stem/descriptor/export.py | 3 +++ stem/descriptor/extrainfo_descriptor.py | 4 ++++ stem/descriptor/networkstatus.py | 3 +++ stem/descriptor/reader.py | 3 +++ stem/descriptor/router_status_entry.py | 3 +++ stem/descriptor/server_descriptor.py | 3 +++ stem/exit_policy.py | 4 ++++ stem/prereq.py | 3 +++ stem/process.py | 3 +++ stem/response/__init__.py | 4 ++++ stem/response/authchallenge.py | 3 +++ stem/response/events.py | 4 ++++ stem/response/getconf.py | 3 +++ stem/response/getinfo.py | 3 +++ stem/response/mapaddress.py | 3 +++ stem/response/protocolinfo.py | 3 +++ stem/socket.py | 4 ++++ stem/util/__init__.py | 3 +++ stem/util/conf.py | 4 ++++ stem/util/connection.py | 3 +++ stem/util/enum.py | 3 +++ stem/util/log.py | 3 +++ stem/util/proc.py | 3 +++ stem/util/str_tools.py | 3 +++ stem/util/system.py | 3 +++ stem/util/term.py | 3 +++ stem/util/tor_tools.py | 4 ++++ stem/version.py | 3 +++ test/__init__.py | 4 ++++ test/mocking.py | 4 ++++ test/network.py | 4 ++++ test/output.py | 3 +++ test/prompt.py | 3 +++ test/runner.py | 4 ++++ test/settings.cfg | 6 +++--- test/static_checks.py | 3 +++ test/util.py | 3 +++ 43 files changed, 141 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 1154870..4ec2dbd 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information """ Runs unit and integration tests. For usage information run this with '--help'. diff --git a/setup.py b/setup.py index 395f97c..23902b1 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information from stem import __version__, \ __author__, \ diff --git a/stem/__init__.py b/stem/__init__.py index ae72ab8..510c46c 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -1,3 +1,7 @@ +# Copyright 2011-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Library for working with the tor process. diff --git a/stem/connection.py b/stem/connection.py index a581c99..688a8a1 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Functions for connecting and authenticating to the tor process. diff --git a/stem/control.py b/stem/control.py index d799922..347dec0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1,3 +1,7 @@ +# Copyright 2011-2013, Damian Johnson +# Copyright 2012-2013, Sean Robinson +# See LICENSE for licensing information + """ Classes for interacting with the tor control socket. diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 87872d6..b3cc8c9 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2013, Sean Robinson +# See LICENSE for licensing information + """ Package for parsing and processing descriptor data. diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index 0643440..eb9ba2b 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Toolkit for exporting descriptors to other formats. diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 10bd6fd..cc779b8 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Parsing for Tor extra-info descriptors. These are published by relays whenever their server descriptor is published and have a similar format. However, unlike diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 3104cad..c3fac3e 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Parsing for Tor network status documents. This supports both the v2 and v3 dir-spec. Documents can be obtained from a few sources... diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index ffd0289..f3b77ae 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Utilities for reading descriptors from local directories and archives. This is mostly done through the :class:`~stem.descriptor.reader.DescriptorReader` diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index d22dfa3..4bdef70 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Parsing for router status entries, the information for individual routers within a network status document. This information is provided from a few diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index be63ddf..9cecb23 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Parsing for Tor server descriptors, which contains the infrequently changing information about a Tor relay (contact information, exit policy, public keys, diff --git a/stem/exit_policy.py b/stem/exit_policy.py index e60f121..475d67e 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2013, Sean Robinson +# See LICENSE for licensing information + """ Representation of tor exit policies. These can be easily used to check if exiting to a destination is permissible or not. For instance... diff --git a/stem/prereq.py b/stem/prereq.py index a6eab48..4c0ffcd 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Checks for stem dependencies. We require python 2.5 or greater (in the 2.x series). Other requirements for complete functionality are... diff --git a/stem/process.py b/stem/process.py index 52a931e..4c7d118 100644 --- a/stem/process.py +++ b/stem/process.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Helper functions for working with tor as a process. diff --git a/stem/response/__init__.py b/stem/response/__init__.py index c413530..838ea89 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Parses replies from the control socket. diff --git a/stem/response/authchallenge.py b/stem/response/authchallenge.py index 58bc48d..c14369b 100644 --- a/stem/response/authchallenge.py +++ b/stem/response/authchallenge.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + import binascii import stem.response diff --git a/stem/response/events.py b/stem/response/events.py index 861459a..85710c2 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + import datetime import re import StringIO diff --git a/stem/response/getconf.py b/stem/response/getconf.py index 5d32582..9cebce9 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + import stem.response import stem.socket diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index 4d3e2f2..1d749e4 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + import stem.response import stem.socket diff --git a/stem/response/mapaddress.py b/stem/response/mapaddress.py index 129eed7..69585bb 100644 --- a/stem/response/mapaddress.py +++ b/stem/response/mapaddress.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + import stem.response import stem.socket diff --git a/stem/response/protocolinfo.py b/stem/response/protocolinfo.py index df7d9c9..8f8c27c 100644 --- a/stem/response/protocolinfo.py +++ b/stem/response/protocolinfo.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + import stem.response import stem.socket import stem.version diff --git a/stem/socket.py b/stem/socket.py index 4277fa1..039a2cd 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -1,3 +1,7 @@ +# Copyright 2011-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Supports message based communication with sockets speaking the tor control protocol. This lets users send messages as basic strings and receive responses diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 53741ae..723eb10 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Utility functions used by the stem library. """ diff --git a/stem/util/conf.py b/stem/util/conf.py index 82677d8..292e3d5 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -1,3 +1,7 @@ +# Copyright 2011-2013, Damian Johnson +# Copyright 2013, Sean Robinson +# See LICENSE for licensing information + """ Handlers for text configuration files. Configurations are simple string to string mappings, with the configuration files using the following rules... diff --git a/stem/util/connection.py b/stem/util/connection.py index 86ba49a..90961fc 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Connection and networking based utility functions. This will likely be expanded later to have all of `arm's functions diff --git a/stem/util/enum.py b/stem/util/enum.py index 4f6d59a..bd983ee 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Basic enumeration, providing ordered types for collections. These can be constructed as simple type listings... diff --git a/stem/util/log.py b/stem/util/log.py index 7010805..e32c42f 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Functions to aid library logging. The default logging :data:`~stem.util.log.Runlevel` is usually NOTICE and above. diff --git a/stem/util/proc.py b/stem/util/proc.py index 2abc840..bf7675d 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Helper functions for querying process and system information from the /proc contents. Fetching information this way provides huge performance benefits diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 2733875..ef69da7 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Toolkit for various string activity. diff --git a/stem/util/system.py b/stem/util/system.py index bc598b1..c35e22f 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Helper functions for working with the underlying system. These are mostly os dependent, only working on linux, osx, and bsd. In almost all cases they're diff --git a/stem/util/term.py b/stem/util/term.py index 050c485..fee7596 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Utilities for working with the terminal. diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index e61a96c..9c0f572 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Miscellaneous utility functions for working with tor. diff --git a/stem/version.py b/stem/version.py index 00e0769..b138f8b 100644 --- a/stem/version.py +++ b/stem/version.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Tor versioning information and requirements for its features. These can be easily parsed and compared, for instance... diff --git a/test/__init__.py b/test/__init__.py index 098ce65..bc7c694 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,3 +1,7 @@ +# Copyright 2011-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Unit and integration tests for the stem library. """ diff --git a/test/mocking.py b/test/mocking.py index f1e863d..d912685 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Helper functions for creating mock objects and monkey patching to help with testing. With python's builtin unit testing framework the setUp and test diff --git a/test/network.py b/test/network.py index 11bba6f..c8f0e97 100644 --- a/test/network.py +++ b/test/network.py @@ -1,3 +1,7 @@ +# Copyright 2012-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Helper functions and classes to support tests which need to connect through the tor network. diff --git a/test/output.py b/test/output.py index e3b9daf..17c457e 100644 --- a/test/output.py +++ b/test/output.py @@ -1,3 +1,6 @@ +# Copyright 2011-2013, Damian Johnson +# See LICENSE for licensing information + """ Variety of filters for the python unit testing output, which can be chained together for improved readability. diff --git a/test/prompt.py b/test/prompt.py index 6ea9aa9..c28c914 100644 --- a/test/prompt.py +++ b/test/prompt.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Simple helper methods to make troubleshooting with the python interpreter easier. diff --git a/test/runner.py b/test/runner.py index d9e0def..e5faf1b 100644 --- a/test/runner.py +++ b/test/runner.py @@ -1,3 +1,7 @@ +# Copyright 2011-2013, Damian Johnson +# Copyright 2012, Sean Robinson +# See LICENSE for licensing information + """ Runtime context for the integration tests. This is used both by the test runner to start and stop tor, and by the integration tests themselves for information diff --git a/test/settings.cfg b/test/settings.cfg index b467fd4..9b606c5 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -157,9 +157,9 @@ target.torrc RUN_PTRACE => PORT, PTRACE 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 55 -pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes' from line 54 -pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode' from line 60 +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 59 +pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes' from line 57 +pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode' from line 63 pyflakes.ignore test/mocking.py => undefined name 'builtins' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names diff --git a/test/static_checks.py b/test/static_checks.py index 2f758b8..43b6866 100644 --- a/test/static_checks.py +++ b/test/static_checks.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + """ Performs a check that our python source code follows its whitespace conventions which are... diff --git a/test/util.py b/test/util.py index 4035a21..467ca91 100644 --- a/test/util.py +++ b/test/util.py @@ -1,3 +1,6 @@ +# Copyright 2012-2013, Damian Johnson +# See LICENSE for licensing information + import socket import struct

1 0

[stem/master] Providing a string when str() is called on descriptors
by atagar＠torproject.org 17 Feb '13

17 Feb '13

commit 1a099106c43e37bf41f5c1f803f27cd2aad270f5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 17 13:57:15 2013 -0800 Providing a string when str() is called on descriptors Python 2.x gets pretty confused when an object's __str__ method provides a unicode string. Calling... >>> str(desc) Traceback (most recent call last): File "<stdin>", line 1, in <module> UnicodeEncodeError: 'ascii' codec can't encode character u'\xab' in position 28: ordinal not in range(128) Providing an ascii str in python 2.x and unicode str in python 3.x. Thanks to Sathyanarayanan for the catch! --- stem/descriptor/__init__.py | 5 ++++- stem/util/str_tools.py | 14 ++++++++------ test/integ/descriptor/server_descriptor.py | 7 +++++++ test/settings.cfg | 4 ++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index b3cc8c9..25b180b 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -297,7 +297,10 @@ class Descriptor(object): self._archive_path = path def __str__(self): - return self._raw_contents + if stem.prereq.is_python_3(): + return self._raw_contents + else: + return str(stem.util.str_tools.to_bytes(self._raw_contents)) class _UnicodeReader(object): diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index ef69da7..14198b4 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -20,6 +20,7 @@ Toolkit for various string activity. parse_iso_timestamp - parses an ISO timestamp as a datetime value """ +import codecs import datetime import stem.prereq @@ -52,11 +53,9 @@ TIME_UNITS = ( ) if stem.prereq.is_python_3(): - import codecs - def _to_bytes(msg): if isinstance(msg, str): - return codecs.latin_1_encode(msg)[0] + return codecs.latin_1_encode(msg, "replace")[0] else: return msg @@ -67,7 +66,10 @@ if stem.prereq.is_python_3(): return msg else: def _to_bytes(msg): - return msg + if msg is not None and isinstance(msg, unicode): + return codecs.latin_1_encode(msg, "replace")[0] + else: + return msg def _to_unicode(msg): if msg is not None and not isinstance(msg, unicode): @@ -84,7 +86,7 @@ def to_bytes(msg): http://python3porting.com/problems.html#nicer-solutions - :param msg label: string to be converted + :param str,unicode msg: string to be converted :returns: ASCII bytes for string """ @@ -98,7 +100,7 @@ def to_unicode(msg): provide python 3 compatability, normalizing the unicode/ASCII change in the version bump. - :param msg label: string to be converted + :param str,unicode msg: string to be converted :returns: unicode conversion """ diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index c1cd742..fb2e2b3 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -221,6 +221,13 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(stem.exit_policy.ExitPolicy("reject *:*"), desc.exit_policy) self.assertEquals([], desc.get_unrecognized_lines()) + # Make sure that we can get a string representation for this descriptor + # (having unicode content risks a UnicodeEncodeError)... + # + # https://trac.torproject.org/8265 + + self.assertTrue(isinstance(str(desc), str)) + def test_cr_in_contact_line(self): """ Parses a descriptor with a huge contact line containing anomalous carriage diff --git a/test/settings.cfg b/test/settings.cfg index 9b606c5..558b43b 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -158,8 +158,8 @@ 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 59 -pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes' from line 57 -pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode' from line 63 +pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes' from line 56 +pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode' from line 62 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

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit acab20d888b57f1f19ffa58ef99da9b81ab554a6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 21:16:49 2013 +0000 Update translations for torbirdy_completed --- eu/torbirdy.dtd | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index 16037d4..14f1fc5 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label "Berretsi Enigmail gaituta dagoen eposta bidali baino lehen [lehentsia: es berretsi]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Gaitu Thunderbirden eposta konfigurazio morroi automatikoa [lehenetsia: ezgaituta]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.account_specific "Kontuaren araberakoa"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Kontu bat aukeratu:"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Erabili JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Erabili Whonix"> <!ENTITY torbirdy.panel.preferences.label "Ireki TorBirdy hobespenak"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy lehen-abioa">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit 405930077971eb9fb6df21368317e7ef3a7170b8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 21:16:46 2013 +0000 Update translations for torbirdy --- eu/torbirdy.dtd | 6 +++--- eu/torbirdy.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd index a08bb06..14f1fc5 100644 --- a/eu/torbirdy.dtd +++ b/eu/torbirdy.dtd @@ -39,8 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label "Berretsi Enigmail gaituta dagoen eposta bidali baino lehen [lehentsia: es berretsi]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> -<!ENTITY torbirdy.prefs.emailwizard.label ""> -<!ENTITY torbirdy.prefs.emailwizard.key ""> +<!ENTITY torbirdy.prefs.emailwizard.label "Gaitu Thunderbirden eposta konfigurazio morroi automatikoa [lehenetsia: ezgaituta]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.account_specific "Kontuaren araberakoa"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Kontu bat aukeratu:"> @@ -50,4 +50,4 @@ <!ENTITY torbirdy.panel.usewhonix.label "Erabili Whonix"> <!ENTITY torbirdy.panel.preferences.label "Ireki TorBirdy hobespenak"> -<!ENTITY torbirdy.firstrun.title ""> +<!ENTITY torbirdy.firstrun.title "TorBirdy lehen-abioa"> diff --git a/eu/torbirdy.properties b/eu/torbirdy.properties index 448c32f..ccb50bf 100644 --- a/eu/torbirdy.properties +++ b/eu/torbirdy.properties @@ -16,4 +16,4 @@ torbirdy.email.advanced.title=TorBirdy ezarpen aurreratuak torbirdy.restart=Denbora gunearen hobespena efektua izan dezan, itxi ezazu mesedez Thunderbird eta ireki ezazu berriz. # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. -# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit 0f9589d1fedbed368ad7b7e415d71460076091cb Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 15:46:20 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/torbirdy.properties b/es/torbirdy.properties index bda86d8..e907559 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -15,5 +15,5 @@ torbirdy.email.advanced.title=Configuración avanzada de TorBirdy torbirdy.restart=Para que la configuración de zona horaria sea efectiva, cierre Thunderbird e inícielo de nuevo. -torbirdy.firstrun=Ahora está ejecutando TorBirdy.\n\nPara proteger su anonimato, TorBirdy implementará las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas y a esas se accede a traves de diálogo de preferencias de TorBirdy. Cuando TorBirdy está desinstalado o deshabilitado, todas las preferencias que este cambia son restablecidas a sus valores por defecto (los valores previos a la instación de TorBirdy).\n\nSi es usted un nuevo usuario, es recomendable que se lea el sitio web de TorBirdy para comprender lo que estamos tratando que TorBirdy consiga para nuestros usuarios. +torbirdy.firstrun=Está ejecutando TorBirdy en este momento.\n\nPara proteger su anonimato, TorBirdy implementará las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas, y a ellas se accede a través del cuadro de preferencias de TorBirdy. Cuando TorBirdy se desinstale o deshabilite, todas las preferencias que este cambia se restablecen a sus valores predeterminados (los valores previos a la instación de TorBirdy).\n\nSi usted es un usuario novel, es recomendable que lea el sitio web de TorBirdy para comprender qué es lo que estamos estamos intentado que TorBirdy consiga para nuestros usuarios. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit d9c4969f9e29e2091840fb262808cc19549ee90f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 15:46:14 2013 +0000 Update translations for torbirdy --- es/torbirdy.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/torbirdy.properties b/es/torbirdy.properties index bda86d8..e907559 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -15,5 +15,5 @@ torbirdy.email.advanced.title=Configuración avanzada de TorBirdy torbirdy.restart=Para que la configuración de zona horaria sea efectiva, cierre Thunderbird e inícielo de nuevo. -torbirdy.firstrun=Ahora está ejecutando TorBirdy.\n\nPara proteger su anonimato, TorBirdy implementará las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas y a esas se accede a traves de diálogo de preferencias de TorBirdy. Cuando TorBirdy está desinstalado o deshabilitado, todas las preferencias que este cambia son restablecidas a sus valores por defecto (los valores previos a la instación de TorBirdy).\n\nSi es usted un nuevo usuario, es recomendable que se lea el sitio web de TorBirdy para comprender lo que estamos tratando que TorBirdy consiga para nuestros usuarios. +torbirdy.firstrun=Está ejecutando TorBirdy en este momento.\n\nPara proteger su anonimato, TorBirdy implementará las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas, y a ellas se accede a través del cuadro de preferencias de TorBirdy. Cuando TorBirdy se desinstale o deshabilite, todas las preferencias que este cambia se restablecen a sus valores predeterminados (los valores previos a la instación de TorBirdy).\n\nSi usted es un usuario novel, es recomendable que lea el sitio web de TorBirdy para comprender qué es lo que estamos estamos intentado que TorBirdy consiga para nuestros usuarios. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 17 Feb '13

17 Feb '13

commit 602b4902c64c944bfe8cc90647c953f53fc10440 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 17 15:16:44 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 4 ++++ es/torbirdy.properties | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 61b63cc..2e1bdd3 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -39,6 +39,8 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar el correo si Enigmail está habilitado [predeterminado: no confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Habilitar asistente de configuración automática de correo electrónico de Thunderbird [predeterminado: deshabilitado]"> +<!ENTITY torbirdy.prefs.emailwizard.key "a"> <!ENTITY torbirdy.prefs.account_specific "Configuración específica de la cuenta"> <!ENTITY torbirdy.prefs.select_account.key "c"> <!ENTITY torbirdy.prefs.select_account.label "Elegir una cuenta"> @@ -47,3 +49,5 @@ <!ENTITY torbirdy.panel.usejondo.label "Usar JonDo (premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Usar Whonix (virtualización)"> <!ENTITY torbirdy.panel.preferences.label "Abrir Preferencias de TorBirdy"> + +<!ENTITY torbirdy.firstrun.title "Primera ejecución de TorBirdy"> diff --git a/es/torbirdy.properties b/es/torbirdy.properties index a90285d..bda86d8 100644 --- a/es/torbirdy.properties +++ b/es/torbirdy.properties @@ -14,3 +14,6 @@ torbirdy.email.advanced.nextwarning=Mostrar esta advertencia la próxima vez torbirdy.email.advanced.title=Configuración avanzada de TorBirdy torbirdy.restart=Para que la configuración de zona horaria sea efectiva, cierre Thunderbird e inícielo de nuevo. + +torbirdy.firstrun=Ahora está ejecutando TorBirdy.\n\nPara proteger su anonimato, TorBirdy implementará las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas y a esas se accede a traves de diálogo de preferencias de TorBirdy. Cuando TorBirdy está desinstalado o deshabilitado, todas las preferencias que este cambia son restablecidas a sus valores por defecto (los valores previos a la instación de TorBirdy).\n\nSi es usted un nuevo usuario, es recomendable que se lea el sitio web de TorBirdy para comprender lo que estamos tratando que TorBirdy consiga para nuestros usuarios. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0