- tor-commits - lists.torproject.org

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

09 Dec '12

commit 3485fde5a967b61ece27b6bc4abbf1d07c964cc0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 9 03:15:08 2012 +0000 Update translations for gettor_completed --- es/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index 2b90561..101b6a1 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 23:41+0000\n" +"PO-Revision-Date: 2012-12-09 02:45+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" @@ -299,7 +299,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "Desafortunadamente no hay un paquete fraccionado para el paquete que ha solicitado. Por favor envíenos el nombre de otro paquete o solicite el mismo paquete de nuevo, pero elimine la palabra 'split'. En ese caso le enviaremos el paquete completo. Asegúrese de que esto es lo que quiere." +msgstr "Desafortunadamente no tenemos el archivo fraccionado del paquete que\nha solicitado. Por favor envíenos otro nombre de paquete, o solicite otra\nvez el mismo eliminando la palabra 'split' y en tal caso le enviaremos el paquete completo. Asegúrese previamente de que esto es lo que quiere." #: lib/gettor/i18n.py:193 msgid ""

1 0

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

09 Dec '12

commit 89d8afa30dc9e68a71d987ceb713f3abc84c309c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 9 03:15:05 2012 +0000 Update translations for gettor --- es/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index 2b90561..101b6a1 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 23:41+0000\n" +"PO-Revision-Date: 2012-12-09 02:45+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" @@ -299,7 +299,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "Desafortunadamente no hay un paquete fraccionado para el paquete que ha solicitado. Por favor envíenos el nombre de otro paquete o solicite el mismo paquete de nuevo, pero elimine la palabra 'split'. En ese caso le enviaremos el paquete completo. Asegúrese de que esto es lo que quiere." +msgstr "Desafortunadamente no tenemos el archivo fraccionado del paquete que\nha solicitado. Por favor envíenos otro nombre de paquete, o solicite otra\nvez el mismo eliminando la palabra 'split' y en tal caso le enviaremos el paquete completo. Asegúrese previamente de que esto es lo que quiere." #: lib/gettor/i18n.py:193 msgid ""

1 0

[ooni-probe/master] Do not call reactor.stop in netalyzr test.
by art＠torproject.org 09 Dec '12

09 Dec '12

commit fb9d25b80d761532c41034fffc255244b3175fab Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Dec 9 01:08:19 2012 +0100 Do not call reactor.stop in netalyzr test. --- nettests/third_party/netalyzr.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py index b3a0a3d..9b21831 100644 --- a/nettests/third_party/netalyzr.py +++ b/nettests/third_party/netalyzr.py @@ -37,7 +37,6 @@ class NetalyzrWrapperTest(nettest.NetTestCase): except: log.debug("Netalyzr had an error, please see the log file: %s" % self.output_file) finally: - reactor.callFromThread(reactor.stop) self.clean_up() def clean_up(self):

1 0

[ooni-probe/master] Do not attach both an errback and callback in runner for better debugging
by art＠torproject.org 09 Dec '12

09 Dec '12

commit 45a1e07dbd226cc35919e78c97267dfca7e357a9 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Dec 9 00:49:30 2012 +0100 Do not attach both an errback and callback in runner for better debugging * Call finish on the yaml reporter once it has done it's run --- ooni/oonicli.py | 8 +++++++- ooni/reporter.py | 2 +- ooni/runner.py | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 44334f0..b06bde9 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -87,6 +87,10 @@ def testsEnded(*arg, **kw): try: reactor.stop() except: pass +def testFailed(failure): + log.err("Failed in running a test inside a test list") + failure.printTraceback() + def runTestList(none, test_list): """ none: is always None. @@ -102,7 +106,8 @@ def runTestList(none, test_list): deck_dl.append(d1) d2 = defer.DeferredList(deck_dl) - d2.addBoth(testsEnded) + d2.addCallback(testsEnded) + d2.addErrback(testFailed) # Print every 5 second the list of current tests running l = task.LoopingCall(updateStatusBar) @@ -110,6 +115,7 @@ def runTestList(none, test_list): return d2 def errorRunningTests(failure): + log.err("There was an error in running a test") failure.printTraceback() def run(): diff --git a/ooni/reporter.py b/ooni/reporter.py index b5de29f..728c3f5 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -171,7 +171,7 @@ class OReporter(object): """ raise NotImplemented - def finish(): + def finish(self): pass def testDone(self, test, test_name): diff --git a/ooni/runner.py b/ooni/runner.py index 77d7e7d..4ebfa0b 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -451,6 +451,7 @@ def runTestCases(test_cases, options, cmd_line_options): except Exception: log.exception("Problem in running test") + yaml_reporter.finish() class UnableToStartTor(Exception): pass

1 0

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

08 Dec '12

commit 243c779cbae8365efa4669f69d29bd8f2ca2b109 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 8 23:45:09 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 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

[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