- tor-commits - lists.torproject.org

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 22 Dec '12

22 Dec '12

commit fd261d10aabe4faefdcd1e025d9bd004161d9dd8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:18 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7716518..37c6fb6 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-22 21:59+0000\n" +"PO-Revision-Date: 2012-12-22 22:30+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"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 22 Dec '12

22 Dec '12

commit c1b7fda131a02e6df706376cede46d3fb7547cd3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:14 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7716518..37c6fb6 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-22 21:59+0000\n" +"PO-Revision-Date: 2012-12-22 22:30+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"

1 0

[stem/master] Documentation and output string fixes
by atagar＠torproject.org 22 Dec '12

22 Dec '12

commit cfc745e95010b4c86a8d794c118bfafafee4d59d Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Dec 21 09:17:23 2012 -0700 Documentation and output string fixes Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 10 +++++----- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/response/__init__.py | 1 + test/mocking.py | 2 +- test/unit/response/control_message.py | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/stem/control.py b/stem/control.py index 1e5250a..15b762e 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1045,8 +1045,8 @@ class Controller(BaseController): There are three use cases for GETCONF: - 1. a single value is provided (ex. **ControlPort**) - 2. multiple values are provided for the option (ex. **ExitPolicy**) + 1. a single value is provided (e.g. **ControlPort**) + 2. multiple values are provided for the option (e.g. **ExitPolicy**) 3. a set of options that weren't necessarily requested are returned (for instance querying **HiddenServiceOptions** gives **HiddenServiceDir**, **HiddenServicePort**, etc) @@ -1061,8 +1061,8 @@ class Controller(BaseController): :param str,list params: configuration option(s) to be queried :param object default: value for the mappings if the configuration option is either undefined or the query fails - :param bool multiple: if **True** then the provided are lists with all of - the present values + :param bool multiple: if **True** then the values provided are lists with + all of the present values :returns: **dict** of the 'config key => value' mappings. The value is a... @@ -1429,7 +1429,7 @@ class Controller(BaseController): :param list,str path: one or more relays to make a circuit through :param str purpose: "general" or "controller" - :returns: int of the circuit id of the newly created circuit + :returns: str of the circuit id of the newly created circuit """ return self.extend_circuit(0, path, purpose) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index d53f79b..8ad10e1 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -856,7 +856,7 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): for entry in value.split(','): if not '=' in entry: - raise stem.ProtocolError("The bridge-ip-versions should be a comma separated listing of '<protocol>=<count>' mappings: %s" % line) + raise stem.ProtocolError("The bridge-ip-versions should be a comma separated listing of '<protocol>=<count>' mappings: %s" % line) protocol, count = entry.split('=', 1) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 2e9296d..06c80ca 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -63,6 +63,7 @@ def convert(response_type, message, **kwargs): * **\*** GETINFO * **\*** GETCONF * **&** **^** MAPADDRESS + * EVENT * PROTOCOLINFO * AUTHCHALLENGE * SINGLELINE diff --git a/test/mocking.py b/test/mocking.py index 86acb2a..20ac76e 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -445,7 +445,7 @@ def get_message(content, reformat = True): :param str content: base content for the controller message :param str reformat: modifies content to be more accommodating to being parsed - :returns: stem.socket.ControlMessage instance + :returns: stem.response.ControlMessage instance """ if reformat: diff --git a/test/unit/response/control_message.py b/test/unit/response/control_message.py index 9ebd4bc..51ad8f0 100644 --- a/test/unit/response/control_message.py +++ b/test/unit/response/control_message.py @@ -96,8 +96,8 @@ class TestControlMessage(unittest.TestCase): def test_no_crlf(self): """ - Checks that we get a ProtocolError when we don't have both a carrage - returna and newline for line endings. This doesn't really check for + Checks that we get a ProtocolError when we don't have both a carriage + return and newline for line endings. This doesn't really check for newlines (since that's what readline would break on), but not the end of the world. """

1 0

[stem/master] Fix test_close_circuit crash by concatenating strings
by atagar＠torproject.org 22 Dec '12

22 Dec '12

commit 9119f9f0d0091a030654002a2e7ae6ccf91a789f Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Dec 16 19:32:22 2012 -0700 Fix test_close_circuit crash by concatenating strings Traceback: File "./test/integ/control/controller.py", line 521, in test_close_circuit self.assertRaises(stem.InvalidArguments, controller.close_circuit, circ_id + 1024) TypeError: cannot concatenate 'str' and 'int' objects Also, change to standard variable name "circuit_id". Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/integ/control/controller.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 0cee344..969836b 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -552,20 +552,20 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - circ_id = controller.new_circuit() - controller.close_circuit(circ_id) + circuit_id = controller.new_circuit() + controller.close_circuit(circuit_id) circuit_output = controller.get_info("circuit-status") circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) - circ_id = controller.new_circuit() - controller.close_circuit(circ_id, "IfUnused") + circuit_id = controller.new_circuit() + controller.close_circuit(circuit_id, "IfUnused") circuit_output = controller.get_info("circuit-status") circ = [x.split()[0] for x in circuit_output.splitlines()] self.assertFalse(circ_id in circ) - circ_id = controller.new_circuit() - self.assertRaises(stem.InvalidArguments, controller.close_circuit, circ_id + 1024) + circuit_id = controller.new_circuit() + self.assertRaises(stem.InvalidArguments, controller.close_circuit, circuit_id + "1024") self.assertRaises(stem.InvalidRequest, controller.close_circuit, "") def test_mapaddress(self):

1 0

[stem/master] Fix test_repurpose_circuit crash by changing directive in format string
by atagar＠torproject.org 22 Dec '12

22 Dec '12

commit 848d4c95b5c6f908755ac7db4019a3ac2bf2e9eb Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Dec 16 19:46:41 2012 -0700 Fix test_repurpose_circuit crash by changing directive in format string Traceback: File "./test/integ/control/controller.py", line 486, in test_repurpose_circuit circ = filter(re.compile("^%i " % circ_id).match, circuit_output.splitlines())[0] TypeError: %d format: a number is required, not str Also, change to standard variable name "circuit_id. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/integ/control/controller.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 969836b..8c68ee2 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -527,15 +527,15 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - circ_id = controller.new_circuit() - controller.repurpose_circuit(circ_id, "CONTROLLER") + circuit_id = controller.new_circuit() + controller.repurpose_circuit(circuit_id, "CONTROLLER") circuit_output = controller.get_info("circuit-status") - circ = filter(re.compile("^%i " % circ_id).match, circuit_output.splitlines())[0] + circ = filter(re.compile("^%s " % circuit_id).match, circuit_output.splitlines())[0] self.assertTrue("PURPOSE=CONTROLLER" in circ) - controller.repurpose_circuit(circ_id, "GENERAL") + controller.repurpose_circuit(circuit_id, "GENERAL") circuit_output = controller.get_info("circuit-status") - circ = filter(re.compile("^%i " % circ_id).match, circuit_output.splitlines())[0] + circ = filter(re.compile("^%s " % circuit_id).match, circuit_output.splitlines())[0] self.assertTrue("PURPOSE=GENERAL" in circ) self.assertRaises(stem.InvalidRequest, controller.repurpose_circuit, 'f934h9f3h4', "fooo")

1 0

[stem/master] Integ test fixes concerning string circ/stream ids
by atagar＠torproject.org 22 Dec '12

22 Dec '12

commit a5b05edefbbcbc7261e40a5842a1ef901a60a25c Merge: f60e327 5687229 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 22 14:30:29 2012 -0800 Integ test fixes concerning string circ/stream ids Fixes from Sean to fix integration tests broken by commit 6711458... https://trac.torproject.org/7778 test/integ/control/controller.py | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-)

1 0

[stem/master] Fix test_extendcircuit by removing int() conversion
by atagar＠torproject.org 22 Dec '12

22 Dec '12

commit 568722919c499c1e409680fe38fb3471a97b425c Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Dec 16 20:02:49 2012 -0700 Fix test_extendcircuit by removing int() conversion Traceback: File "./test/integ/control/controller.py", line 464, in test_extendcircuit self.assertTrue(filter(lambda x: int(x.split()[0]) == circ_id, controller.get_info('circuit-status').splitlines())) AssertionError: [] is not true Also, change to standard variable name "circuit_id". --- test/integ/control/controller.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 8c68ee2..4388cdc 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -506,11 +506,11 @@ class TestController(unittest.TestCase): elif test.runner.require_online(self): return with test.runner.get_runner().get_tor_controller() as controller: - circ_id = controller.extend_circuit('0') + circuit_id = controller.extend_circuit('0') # check if our circuit was created - self.assertTrue(filter(lambda x: int(x.split()[0]) == circ_id, controller.get_info('circuit-status').splitlines())) - circ_id = controller.new_circuit() - self.assertTrue(filter(lambda x: int(x.split()[0]) == circ_id, controller.get_info('circuit-status').splitlines())) + self.assertTrue(filter(lambda x: x.split()[0] == circuit_id, controller.get_info('circuit-status').splitlines())) + circuit_id = controller.new_circuit() + self.assertTrue(filter(lambda x: x.split()[0] == circuit_id, controller.get_info('circuit-status').splitlines())) self.assertRaises(stem.InvalidRequest, controller.extend_circuit, "foo") self.assertRaises(stem.InvalidRequest, controller.extend_circuit, '0', "thisroutershouldntexistbecausestemexists!@##$%#")

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 22 Dec '12

22 Dec '12

commit b9bd08cd593fc1d2d1c040c0378a7cbd08c958bc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:15:22 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9e33739..7716518 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-22 21:30+0000\n" +"PO-Revision-Date: 2012-12-22 21:59+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" @@ -1743,11 +1743,11 @@ msgstr "Conectando a un repositorio de repetidores (relays)" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection" -msgstr "Estableciendo una conexión encriptada con el directorio" +msgstr "Estableciendo una conexión cifrada con un repositorio de repetidores (relays)" msgctxt "MainWindow" msgid "Retrieving network status" -msgstr "Recuperando el estado de la red" +msgstr "Recopilando el estado de la red" msgctxt "MainWindow" msgid "Loading network status"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 22 Dec '12

22 Dec '12

commit c564ba42d152d5890d3589c5786de5e7e903e5d4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:15:16 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9e33739..7716518 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-22 21:30+0000\n" +"PO-Revision-Date: 2012-12-22 21:59+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" @@ -1743,11 +1743,11 @@ msgstr "Conectando a un repositorio de repetidores (relays)" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection" -msgstr "Estableciendo una conexión encriptada con el directorio" +msgstr "Estableciendo una conexión cifrada con un repositorio de repetidores (relays)" msgctxt "MainWindow" msgid "Retrieving network status" -msgstr "Recuperando el estado de la red" +msgstr "Recopilando el estado de la red" msgctxt "MainWindow" msgid "Loading network status"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 22 Dec '12

22 Dec '12

commit eb244a356bf4501e0c7639f42542fca40f035b9a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 21:45:17 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index efb67da..9e33739 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-22 21:08+0000\n" +"PO-Revision-Date: 2012-12-22 21:30+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" @@ -1671,35 +1671,35 @@ msgstr "Ayuda" msgctxt "MainWindow" msgid "New Identity" -msgstr "Nueva identidad ()" +msgstr "Nueva identidad (en la red Tor)" msgctxt "MainWindow" msgid "Ctrl+T" -msgstr "Ctrl + T" +msgstr "Ctrl+T" msgctxt "MainWindow" msgid "Ctrl+B" -msgstr "Ctrl + B" +msgstr "Ctrl+B" msgctxt "MainWindow" msgid "Ctrl+L" -msgstr "Ctrl + L" +msgstr "Ctrl+L" msgctxt "MainWindow" msgid "Ctrl+N" -msgstr "Ctrl + N" +msgstr "Ctrl+N" msgctxt "MainWindow" msgid "Ctrl+?" -msgstr "Ctrl + ?" +msgstr "Ctrl+?" msgctxt "MainWindow" msgid "Ctrl+I" -msgstr "Ctrl + I" +msgstr "Ctrl+I" msgctxt "MainWindow" msgid "Ctrl+P" -msgstr "Ctrl + P" +msgstr "Ctrl+P" msgctxt "MainWindow" msgid "Tor" @@ -1719,15 +1719,15 @@ msgstr "Error al iniciar el navegador" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured web browser" -msgstr "Vidalia no pudo iniciar el navegador configurado" +msgstr "Vidalia no pudo iniciar el navegador que figura configurado" msgctxt "MainWindow" msgid "Error starting IM client" -msgstr "Error al iniciar el cliente IM" +msgstr "Error al iniciar el cliente de mensajería instantanea (IM)" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured IM client" -msgstr "Vidalia no pudo iniciar el cliente IM configurado" +msgstr "Vidalia no pudo iniciar el cliente de mensajería instantanea (IM) que figura configurado" msgctxt "MainWindow" msgid "Error starting proxy server" @@ -1735,11 +1735,11 @@ msgstr "Error al iniciar el servidor proxy" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured proxy server" -msgstr "Vidalia no pudo iniciar el servidor proxy configurado" +msgstr "Vidalia no pudo iniciar el servidor proxy que figura configurado" msgctxt "MainWindow" msgid "Connecting to a relay directory" -msgstr "Conectando a un directorio repetidor" +msgstr "Conectando a un repositorio de repetidores (relays)" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection"

1 0