December 2012 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Dec '12

08 Dec '12

commit 03c9394d9aece33ae6a7cf9495b031da1689d5f7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 8 23:45:07 2012 +0000 Update translations for gettor --- es/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index 52de291..2b90561 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-12-08 22:51+0000\n" +"PO-Revision-Date: 2012-12-08 23:41+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -272,7 +272,7 @@ msgstr "NOTA IMPORTANTE:\nYa que esto forma parte de una solicitud de un archivo msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" -msgstr "Los paquetes pueden llegar en cualquier orden. Por favor asegúrese de que ha recibido todos los paquetes antes de intentar desempacarlos." +msgstr "¡Los paquetes pueden llegar en cualquier orden! ¡Asegúrese de que\nha recibido todos los paquetes antes de intentar desempaquetarlos!" #: lib/gettor/i18n.py:179 #, python-format @@ -291,7 +291,7 @@ msgstr "Si no llega, el paquete podría ser demasiado grande para su proveedor d msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "Desafortunadamente estamos experimentado problemas en este momento y no podemos atender su solicitud ahora. Por favor sea paciente mientras tratamos de resolver el problema." +msgstr "Desafortunadamente estamos sufriendo problemas en este momento\ny no podemos atender su solicitud ahora. Por favor sea paciente\nmientras tratamos de resolver el problema." #: lib/gettor/i18n.py:188 msgid ""

1 0

[stem/master] Minor correction for the get_info() pydocs
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 9fddf70f2d1028dc6434ab866e010ca1fa53fb1d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 8 15:35:38 2012 -0800 Minor correction for the get_info() pydocs The prior comment about when a stem.ProtocolError was raised was mostly right, though it missed an important detail: our 'detection' for the geoip db being unavailabe is based on repeated failures so the that exception likely *won't* be raised for db unavailability. --- stem/control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index c24fe2c..11eefb3 100644 --- a/stem/control.py +++ b/stem/control.py @@ -752,8 +752,8 @@ class Controller(BaseController): provided a default response * :class:`stem.InvalidArguments` if the 'params' requested was invalid - * :class:`stem.ProtocolError` if the geoip database is unavailable - and the response is not in the cache + * :class:`stem.ProtocolError` if the geoip database is known to be + unavailable """ start_time = time.time()

1 0

[stem/master] FIX: ProtocolError is no longer in stem.socket
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit bd386445e7c6bf93348fde50503765fb13341971 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 15:31:57 2012 -0800 FIX: ProtocolError is no longer in stem.socket Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 30c440b..c24fe2c 100644 --- a/stem/control.py +++ b/stem/control.py @@ -657,7 +657,7 @@ class Controller(BaseController): :param functor listener: function to be called when an event is received :param stem.control.EventType events: event types to be listened for - :raises: :class:`stem.socket.ControllerError` if unable to set the events + :raises: :class:`stem.ProtocolError` if unable to set the events """ # first checking that tor supports these event types @@ -678,7 +678,7 @@ class Controller(BaseController): :param stem.control.EventListener listener: listener to be removed - :raises: :class:`stem.socket.ControllerError` if unable to set the events + :raises: :class:`stem.ProtocolError` if unable to set the events """ with self._event_listeners_lock: @@ -696,7 +696,7 @@ class Controller(BaseController): response = self.msg("SETEVENTS %s" % " ".join(self._event_listeners.keys())) if not response.is_ok(): - raise stem.socket.ProtocolError("SETEVENTS received unexpected response\n%s" % response) + raise stem.ProtocolError("SETEVENTS received unexpected response\n%s" % response) def is_caching_enabled(self): """

1 0

[stem/master] Note that some events are original to control-spec V1
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 6da7588be3d0331d4e66a41901510cc680aa7cba Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 7 05:39:42 2012 -0700 Note that some events are original to control-spec V1 Do not explicitly assign a minimum version to some events. Instead, use the Event class version, but add pydocs about when the event was added to Tor. While these events were all added in tor version 0.1.1.1-alpha, not all were in the same commit. Tor commit 9b4aa8d2abbce713 adds V1 BW, CIRC, NEWDESC, ORCONN, and STREAM. Tor commit c2f6fe9b85255185 adds V1 logging (i.e. DEBUG, INFO, etc.). Tor commit 64fc1f7bae174d62 adds ADDRMAP. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/response/events.py | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index e6ef1a0..c4abe12 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -150,6 +150,9 @@ class AddrMapEvent(Event): :var datetime expiry: expiration time of the resolution in local time :var str error: error code if the resolution failed :var datetime utc_expiry: expiration time of the resolution in UTC + + The ADDRMAP event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("hostname", "destination", "expiry") @@ -200,6 +203,9 @@ class BandwidthEvent(Event): :var long read: bytes received by tor that second :var long written: bytes sent by tor that second + + The BW event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("read", "written") @@ -286,6 +292,9 @@ class CircuitEvent(Event): :var datetime created: time when the circuit was created or cannibalized :var stem.CircClosureReason reason: reason for the circuit to be closed :var stem.CircClosureReason remote_reason: remote side's reason for the circuit to be closed + + The CIRC event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("id", "status", "path") @@ -490,6 +499,9 @@ class LogEvent(Event): :var stem.Runlevel runlevel: runlevel of the logged message :var str message: logged message + + The logging events were some of the first Control Protocol V1 events + and were introduced in tor version 0.1.1.1-alpha. """ _SKIP_PARSING = True @@ -555,6 +567,9 @@ class NewDescEvent(Event): :var tuple relays: **(fingerprint, nickname)** tuples for the relays with new descriptors + + The NEWDESC event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. """ def _parse(self): @@ -580,6 +595,9 @@ class ORConnEvent(Event): :var stem.ORStatus status: state of the connection :var stem.ORClosureReason reason: reason for the connection to be closed :var int circ_count: number of established and pending circuits + + The ORCONN event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("endpoint", "status") @@ -692,6 +710,9 @@ class StreamEvent(Event): :var str source_address: requester address (ip or hostname) :var int source_port: requester port :var stem.StreamPurpose purpose: purpose for the stream + + The STREAM event was one of the first Control Protocol V1 events and was + introduced in tor version 0.1.1.1-alpha. """ _POSITIONAL_ARGS = ("id", "status", "circ_id", "target")

1 0

[stem/master] Fix various pydoc typos
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit e2c69117b388abbbeee9240e67365e893b137cd3 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Tue Dec 4 18:38:27 2012 -0700 Fix various pydoc typos Corrections from Sean for our is_alive methods, get_info, and other methods. --- stem/control.py | 12 +++++++----- stem/response/events.py | 4 ++-- stem/socket.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/stem/control.py b/stem/control.py index db5b9c5..a53b9b1 100644 --- a/stem/control.py +++ b/stem/control.py @@ -322,7 +322,7 @@ class BaseController(object): Checks if our socket is currently connected. This is a pass-through for our socket's :func:`~stem.socket.ControlSocket.is_alive` method. - :returns: **bool** that's **True** if we're shut down and **False** otherwise + :returns: **bool** that's **True** if our socket is connected and **False** otherwise """ return self._socket.is_alive() @@ -639,7 +639,7 @@ class Controller(BaseController): Directs further tor controller events to a given function. The function is expected to take a single argument, which is a :class:`~stem.response.events.Event` subclass. For instance the following - would would print the bytes sent and received by tor over five seconds... + would print the bytes sent and received by tor over five seconds... :: @@ -730,7 +730,7 @@ class Controller(BaseController): call fails for any reason (error response, control port closed, initiated, etc). - :param str,list param: GETINFO option or options to be queried + :param str,list params: GETINFO option or options to be queried :param object default: response if the query fails :returns: @@ -743,8 +743,10 @@ class Controller(BaseController): :raises: * :class:`stem.ControllerError` if the call fails and we weren't provided a default response - * :class:`stem.InvalidArguments` if the 'param' requested was + * :class:`stem.InvalidArguments` if the 'params' requested was invalid + * :class:`stem.ProtocolError` if the geoip database is unavailable + and the response is not in the cache """ start_time = time.time() @@ -766,7 +768,7 @@ class Controller(BaseController): reply[param] = self._request_cache[cache_key] params.remove(param) elif param.startswith('ip-to-country/') and self.is_geoip_unavailable(): - # the geoip database aleady looks to be unavailable - abort the request + # the geoip database already looks to be unavailable - abort the request raise stem.ProtocolError("Tor geoip database is unavailable") # if everything was cached then short circuit making the query diff --git a/stem/response/events.py b/stem/response/events.py index eb2aa64..7526c88 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -222,7 +222,7 @@ class BuildTimeoutSetEvent(Event): :var int total_times: circuit build times tor used to determine the timeout :var int timeout: circuit timeout value in milliseconds :var int xm: Pareto parameter Xm in milliseconds - :var float alpha: Paredo paremter alpha + :var float alpha: Pareto parameter alpha :var float quantile: CDF quantile cutoff point :var float timeout_rate: ratio of circuits that have time out :var int close_timeout: duration to keep measurement circuits in milliseconds @@ -432,7 +432,7 @@ class ConfChangedEvent(Event): SETCONF or RELOAD signal. :var dict config: mapping of configuration options to their new values - (**None** of the option is being unset) + (**None** if the option is being unset) """ _SKIP_PARSING = True diff --git a/stem/socket.py b/stem/socket.py index ebaaaae..e4358fa 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -139,7 +139,7 @@ class ControlSocket(object): you need to continually pull from the socket (which is part of what the :class:`~stem.control.BaseController` does). - :returns: bool that's True if we're known to be shut down and False otherwise + :returns: **bool** that's **True** if our socket is connected and **False** otherwise """ return self._is_alive

1 0

[stem/master] Begin version requirements for events
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 86524bf589014f2f6d7a4a9704cc0801663654b2 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 7 04:03:19 2012 -0700 Begin version requirements for events Check that the tor process is of a minimum version able to generate the events requested. Checking versions here improves on the 'Unrecognized event "XXX"' response from the tor process. The SETEVENT control message was added to tor version 0.0.9-pre5 (commit 347d3f9d629df74b). But control protocol V1 changed the message syntax in tor version 0.1.1.1-alpha (commit 9b4aa8d2abbce713) and V0 is not supported. Therefor, version 0.1.1.1-alpha is the baseline for any and all events in Stem. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 8 ++++++-- stem/response/events.py | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index a53b9b1..f7463b0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -660,8 +660,12 @@ class Controller(BaseController): :raises: :class:`stem.socket.ControllerError` if unable to set the events """ - with self._event_listeners_lock: - for event_type in events: + for event_type in events: + event_version = stem.response.events.EVENT_TYPE_TO_CLASS[event_type]._VERSION_ADDED + if not self.get_version().meets_requirements(event_version): + raise stem.InvalidRequest(552, "%s event requires Tor version %s or later" % (event_type, event_version)) + + with self._event_listeners_lock: self._event_listeners.setdefault(event_type, []).append(listener) self._attach_listeners() diff --git a/stem/response/events.py b/stem/response/events.py index 7526c88..e6ef1a0 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -6,6 +6,7 @@ import stem import stem.control import stem.response import stem.descriptor.router_status_entry +import stem.version from stem.util import connection, log, str_tools, tor_tools @@ -32,6 +33,7 @@ class Event(stem.response.ControlMessage): _KEYWORD_ARGS = {} # map of 'keyword => attribute' for recognized attributes _QUOTED = () # positional arguments that are quoted _SKIP_PARSING = False # skip parsing contents into our positional_args and keyword_args + _VERSION_ADDED = stem.version.Version('0.1.1.1-alpha') # minimum version with control-spec V1 event support def _parse_message(self, arrived_at): if not str(self).strip():

1 0

[stem/master] Add version requirements for event types
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 8506a43e04df43166f009c523cb63762d2243aeb Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 15:04:18 2012 -0800 Add version requirements for event types Patch from Sean to add the version requirements for numerous event types... * AUTHDIR_NEWDESCS (added in tor commit b9d37a2d58e76ee2) * BUILDTIMEOUT_SET (version information taken from control-spec.txt) * CIRC_MINOR (added in tor commit 5519e633ec4c48c5) * CLIENTS_SEEN (added in tor commit 5519e633ec4c48c5) * CONF_CHANGED (added in tor commit 5a801a8c8b71c955) * DESCCHANGED (version information taken from control-spec.txt) * GUARD (added in tor commit 31e09bb5242b24d5) * NS (version information taken from control-spec.txt) * NEWCONSENSUS (version information taken from control-spec.txt) * SIGNAL (version information taken from control-spec.txt) * STATUS_* (added in tor commit 4401c47f638a60da) * STREAM_BW (added in tor commit 4a74812c70b75df8) --- stem/response/events.py | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index c4abe12..a8dfa1f 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -181,9 +181,12 @@ class AuthDirNewDescEvent(Event): :var stem.AuthDescriptorAction action: what is being done with the descriptor :var str message: explanation of why we chose this action :var str descriptor: content of the descriptor + + The AUTHDIR_NEWDESCS event was introduced in tor version 0.1.1.10-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.1.1.10-alpha') def _parse(self): lines = str(self).split('\n') @@ -235,6 +238,8 @@ class BuildTimeoutSetEvent(Event): :var float timeout_rate: ratio of circuits that have time out :var int close_timeout: duration to keep measurement circuits in milliseconds :var float close_rate: ratio of measurement circuits that are closed + + The BUILDTIMEOUT_SET event was introduced in tor version 0.2.2.7-alpha. """ _POSITIONAL_ARGS = ("set_type",) @@ -248,6 +253,7 @@ class BuildTimeoutSetEvent(Event): "CLOSE_MS": "close_timeout", "CLOSE_RATE": "close_rate", } + _VERSION_ADDED = stem.version.Version('0.2.2.7-alpha') def _parse(self): # convert our integer and float parameters @@ -347,6 +353,8 @@ class CircMinorEvent(Event): :var datetime created: time when the circuit was created or cannibalized :var stem.CircPurpose old_purpose: prior purpose for the circuit :var stem.HiddenServiceState old_hs_state: prior status as a hidden service circuit + + The CIRC_MINOR event was introduced in tor version 0.2.3.11-alpha. """ _POSITIONAL_ARGS = ("id", "event", "path") @@ -359,6 +367,7 @@ class CircMinorEvent(Event): "OLD_PURPOSE": "old_purpose", "OLD_HS_STATE": "old_hs_state", } + _VERSION_ADDED = stem.version.Version('0.2.3.11-alpha') def _parse(self): self.path = tuple(stem.control._parse_circ_path(self.path)) @@ -389,6 +398,8 @@ class ClientsSeenEvent(Event): :var datetime start_time: time in UTC that we started collecting these stats :var dict locales: mapping of country codes to a rounded count for the number of users :var dict ip_versions: mapping of ip protocols to a rounded count for the number of users + + The CLIENTS_SEEN event was introduced in tor version 0.2.1.10-alpha. """ _KEYWORD_ARGS = { @@ -396,6 +407,7 @@ class ClientsSeenEvent(Event): "CountrySummary": "locales", "IPVersions": "ip_versions", } + _VERSION_ADDED = stem.version.Version('0.2.1.10-alpha') def _parse(self): if self.start_time is not None: @@ -444,9 +456,12 @@ class ConfChangedEvent(Event): :var dict config: mapping of configuration options to their new values (**None** if the option is being unset) + + The CONF_CHANGED event was introduced in tor version 0.2.3.3-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.2.3.3-alpha') def _parse(self): self.config = {} @@ -470,10 +485,13 @@ class ConfChangedEvent(Event): class DescChangedEvent(Event): """ - Event that indicates that our descriptor has changed. This was first added in - tor version 0.1.2.2. + Event that indicates that our descriptor has changed. + + The DESCCHANGED event was introduced in tor version 0.1.2.2-alpha. """ + _VERSION_ADDED = stem.version.Version('0.1.2.2-alpha') + pass class GuardEvent(Event): @@ -483,8 +501,12 @@ class GuardEvent(Event): :var stem.GuardType guard_type: purpose the guard relay is for :var str name: nickname or fingerprint of the guard relay :var stem.GuardStatus status: status of the guard relay + + The GUARD event was introduced in tor version 0.1.2.5-alpha. """ + _VERSION_ADDED = stem.version.Version('0.1.2.5-alpha') + # TODO: We should replace the 'name' field with a fingerprint or nickname # attribute once we know what it can be... # @@ -521,9 +543,12 @@ class NetworkStatusEvent(Event): tor version 0.1.2.3. :var list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors + + The NS event was introduced in tor version 0.1.2.3-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.1.2.3-alpha') def _parse(self): content = str(self).lstrip("NS\n") @@ -541,12 +566,13 @@ class NewConsensusEvent(Event): the whole consensus so anything not listed is implicitly no longer recommended. - This was introduced in tor version 0.2.1.13. - :var list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors + + The NEWCONSENSUS event was introduced in tor version 0.2.1.13-alpha. """ _SKIP_PARSING = True + _VERSION_ADDED = stem.version.Version('0.2.1.13-alpha') def _parse(self): content = str(self).lstrip("NEWCONSENSUS\n") @@ -648,12 +674,13 @@ class SignalEvent(Event): * NEWNYM * CLEARDNSCACHE - This was introduced in tor version 0.2.3.1. - :var stem.Signal signal: signal that tor received + + The SIGNAL event was introduced in tor version 0.2.3.1-alpha. """ _POSITIONAL_ARGS = ("signal",) + _VERSION_ADDED = stem.version.Version('0.2.3.1-alpha') def _parse(self): # log if we recieved an unrecognized signal @@ -677,9 +704,13 @@ class StatusEvent(Event): :var stem.StatusType status_type: category of the status event :var stem.Runlevel runlevel: runlevel of the logged message :var str message: logged message + + The STATUS_GENERAL, STATUS_CLIENT, STATUS_SERVER events were introduced + in tor version 0.1.2.3-alpha. """ _POSITIONAL_ARGS = ("runlevel", "action") + _VERSION_ADDED = stem.version.Version('0.1.2.3-alpha') def _parse(self): if self.type == 'STATUS_GENERAL': @@ -772,9 +803,12 @@ class StreamBwEvent(Event): :var str id: stream identifier :var long written: bytes sent by the application :var long read: bytes received by the application + + The STREAM_BW event was introduced in tor version 0.1.2.8-beta. """ _POSITIONAL_ARGS = ("id", "written", "read") + _VERSION_ADDED = stem.version.Version('0.1.2.8-beta') def _parse(self): if self.id is not None and not tor_tools.is_valid_stream_id(self.id):

1 0

[stem/master] Checking event version prereqs before setting any
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 40827b365e3a5f3dac6d1f8e8ffddd589be6cd70 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 8 15:10:08 2012 -0800 Checking event version prereqs before setting any Checking that our tor version meets all of the event's version prereqs before setting any. This has a few advantages... * It makes add_event_listener() an all-or-nothing operation (ie, failing one of the checks means that no listeners are attached, rather than a few) * Avoids repeated acquisitions of _event_listeners_lock (so other lock users can't slip in-between). * Lets me fix a bug where we were calling SETEVENTS for each event type, rather than a single call when we're done adding the listeners. --- stem/control.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index f7463b0..74127c0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -660,14 +660,17 @@ class Controller(BaseController): :raises: :class:`stem.socket.ControllerError` if unable to set the events """ + # first checking that tor supports these event types for event_type in events: event_version = stem.response.events.EVENT_TYPE_TO_CLASS[event_type]._VERSION_ADDED if not self.get_version().meets_requirements(event_version): raise stem.InvalidRequest(552, "%s event requires Tor version %s or later" % (event_type, event_version)) - - with self._event_listeners_lock: + + with self._event_listeners_lock: + for event_type in events: self._event_listeners.setdefault(event_type, []).append(listener) - self._attach_listeners() + + self._attach_listeners() def remove_event_listener(self, listener): """

1 0

[stem/master] Unexpected TypeError when get_conf() called for non-existant value
by atagar＠torproject.org 08 Dec '12

08 Dec '12

commit 9fc23f64d3534a7e68bb0b66dddbd18b3e8db63c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 8 15:24:50 2012 -0800 Unexpected TypeError when get_conf() called for non-existant value Calling the Controller's get_conf() method would result in a TypeError if the configuration option didn't exist. For instance... ====================================================================== ERROR: test_reattaching_listeners ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 134, in test_reattaching_listeners controller.authenticate() File "/home/atagar/Desktop/stem/stem/control.py", line 954, in authenticate stem.connection.authenticate(self, *args, **kwargs) File "/home/atagar/Desktop/stem/stem/connection.py", line 358, in authenticate authenticate_none(controller, False) File "/home/atagar/Desktop/stem/stem/connection.py", line 435, in authenticate_none auth_response = _msg(controller, "AUTHENTICATE") File "/home/atagar/Desktop/stem/stem/connection.py", line 787, in _msg return controller.msg(message) File "/home/atagar/Desktop/stem/stem/control.py", line 308, in msg self._post_authentication() File "/home/atagar/Desktop/stem/stem/control.py", line 1511, in _post_authentication owning_pid = self.get_conf("__OwningControllerProcess", None) File "/home/atagar/Desktop/stem/stem/control.py", line 1009, in get_conf return _case_insensitive_lookup(entries, param, default) File "/home/atagar/Desktop/stem/stem/control.py", line 1644, in _case_insensitive_lookup for entry in entries: TypeError: 'NoneType' object is not iterable --- stem/control.py | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/stem/control.py b/stem/control.py index 74127c0..30c440b 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1636,14 +1636,15 @@ def _case_insensitive_lookup(entries, key, default = UNDEFINED): :raises: **ValueError** if no such value exists """ - if isinstance(entries, dict): - for k, v in entries.items(): - if k.lower() == key.lower(): - return v - else: - for entry in entries: - if entry.lower() == key.lower(): - return entry + if entries is not None: + if isinstance(entries, dict): + for k, v in entries.items(): + if k.lower() == key.lower(): + return v + else: + for entry in entries: + if entry.lower() == key.lower(): + return entry if default != UNDEFINED: return default else: raise ValueError("key '%s' doesn't exist in dict: %s" % (key, entries))

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 08 Dec '12

08 Dec '12

commit 79afffb0e487cf7b28d4a25806633eb2a3b29158 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 8 23:15:07 2012 +0000 Update translations for gettor_completed --- es/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index dd84720..52de291 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-12-08 22:43+0000\n" +"PO-Revision-Date: 2012-12-08 22:51+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -257,7 +257,7 @@ msgstr "Usted puede adquirir un puente enviando un correo electrónico que conte msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "También es posible obtener puentes con un navegador web en la siguiente dirección: https://bridges.torproject.org/" +msgstr "También es posible obtener repetidores puente (bridges) con un\nnavegador web en la dirección: https://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -266,7 +266,7 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "NOTA IMPORTANTE:\nYa que esto es parte de una solicitud de un archivo fraccionado, necesita esperar a recibir todos los archivos parciales antes de que pueda guardarlos todos en el mismo directorio y desempacarlos haciendo clic en el primer archivo." +msgstr "NOTA IMPORTANTE:\nYa que esto forma parte de una solicitud de un archivo fraccionado,\nnecesita esperar a recibir todos los archivos parciales antes de que\npueda guardarlos todos en la misma carpeta y desempaquetarlos\nhaciendo doble-clic en el primero de los archivos." #: lib/gettor/i18n.py:176 msgid ""

1 0