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

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 08 Nov '12

08 Nov '12

commit 50c48cc6e50149538c2f647d5dda6c9bb0caaeb7 Merge: 5d0ee1b 16d2709 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 16:24:33 2012 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: * Moved metaclass code to separate branch 'meta'. * Removed unused code from assertions.py. * Deleted config.py and process.py. * Removed bug as a result of merging which reintroduced the bug for log messages being printed twice. * Made the submit-patch script create the /patches directory if it doesn't already exist. * Moved /test_inputs/* to /inputs. * Adding new Makefile in top dir * Adding saved copy of *.secdev.org SSL cert so we can correctly check for cert warning. * Updated installation documentation. * Added brief doctrings to get pylint to shutup about it. * Changed the nettest inputParser to no longer be wrapped by @staticmethod, because that might be confusing to test writers. * Changed runner.getTestOptions() to return the localoptions, in addition to setting them as an attribute. * There are still bugs in the options parser, and inputs is a listiterater, which also needs to be fixed. * Fixed oonicli.py trying to catch the wrong exception. * Added a docstring in oonicli.py. * Fixed oonicli.py not printing the help/info message when called without arguments. Conflicts: nettests/simpletest.py Makefile | 198 +++++++++++++++++++++++ bin/ooniprobe | 23 ++-- docs/source/install.rst | 12 ++- inputs/README | 46 ++++++ inputs/dns_tamper_file.txt | 3 + inputs/dns_tamper_test_resolvers.txt | 2 + inputs/http_host_file.txt | 2 + inputs/keyword_filtering_file.txt | 2 + inputs/url_lists_file.txt | 2 + nettests/bridge_reachability/echo.py | 8 +- nettests/simpletest.py | 23 ++- ooni/lib/secdev.org.pem | 20 +++ ooni/nettest.py | 13 ++- ooni/oonicli.py | 22 ++-- ooni/runner.py | 3 + submit-patch | 7 +- test_inputs/README | 48 ------ test_inputs/dns_tamper_file.txt | 3 - test_inputs/dns_tamper_test_resolvers.txt | 2 - test_inputs/http_host_file.txt | 2 - test_inputs/keyword_filtering_file.txt | 2 - test_inputs/url_lists_file.txt | 2 - wtf/README | 9 - wtf/assertions.py | 180 --------------------- wtf/config.py | 66 -------- wtf/meta.py | 241 ----------------------------- wtf/process.py | 73 --------- wtf/timer.py | 107 ------------- 28 files changed, 347 insertions(+), 774 deletions(-) diff --cc nettests/simpletest.py index 11bd485,2769a15..b9efc73 --- a/nettests/simpletest.py +++ b/nettests/simpletest.py @@@ -1,11 -1,21 +1,21 @@@ + #-*- coding: utf-8 -*- + """Contains classes for testing the basic functionality of oonicli.""" + from ooni import nettest + class SimpleTest(nettest.NetTestCase): - inputs = range(1,20) + """ + A very simple test which prints integers, for testing that oonicli is + working correctly. + """ - inputs = range(1, 100) ++ inputs = range(0, 20) optParameters = [['asset', 'a', None, 'Asset file'], - ['controlserver', 'c', 'google.com', 'Specify the control server'], + ['controlserver', 'c', 'google.com', + 'Specify the control server'], ['resume', 'r', 0, 'Resume at this index'], ['other', 'o', None, 'Other arguments']] - def test_foo(self, *arg, **kw): + def test_foo(self): + """Test that tests are working.""" print "Running %s with %s" % ("test_foo", self.input) self.report['test_foo'] = 'Antani' self.report['shared'] = "sblinda"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 08 Nov '12

08 Nov '12

commit 41006aa57030dabe0fa5166d2bebc2209a67c401 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 8 15:15:22 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 35ba448..470120e 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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:46+0000\n" -"PO-Revision-Date: 2012-11-08 13:14+0000\n" +"PO-Revision-Date: 2012-11-08 14:56+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" @@ -344,7 +344,7 @@ msgstr "Conectando a %1:%2... " msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Enviando una solicitud HTTPS para briges (puentes a Tor no propagados)... " +msgstr "Enviando una solicitud HTTPS para bridges (puentes a Tor no propagados)... " msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." @@ -356,11 +356,11 @@ msgstr "Descargando bridges (puentes a Tor no propagados)" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "No pudo descargar puentes: %1" +msgstr "No pudo descargar bridges (puentes a Tor no propagados): %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Reintentando la solicitud de bridges (puentes a Tor no propagados)... " +msgstr "Reintentando la solicitud de bridge (puente a Tor no propagados)... " msgctxt "BridgeUsageDialog" msgid "Country"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 08 Nov '12

08 Nov '12

commit 05ad54a604092e411d25b658f3489244e023f07f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 8 15:15:19 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 8 ++++---- lv/vidalia_lv.po | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 35ba448..470120e 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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:46+0000\n" -"PO-Revision-Date: 2012-11-08 13:14+0000\n" +"PO-Revision-Date: 2012-11-08 14:56+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" @@ -344,7 +344,7 @@ msgstr "Conectando a %1:%2... " msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Enviando una solicitud HTTPS para briges (puentes a Tor no propagados)... " +msgstr "Enviando una solicitud HTTPS para bridges (puentes a Tor no propagados)... " msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." @@ -356,11 +356,11 @@ msgstr "Descargando bridges (puentes a Tor no propagados)" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "No pudo descargar puentes: %1" +msgstr "No pudo descargar bridges (puentes a Tor no propagados): %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Reintentando la solicitud de bridges (puentes a Tor no propagados)... " +msgstr "Reintentando la solicitud de bridge (puente a Tor no propagados)... " msgctxt "BridgeUsageDialog" msgid "Country" diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 70f9944..6d266ac 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,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:46+0000\n" -"PO-Revision-Date: 2012-11-08 14:44+0000\n" +"PO-Revision-Date: 2012-11-08 14:58+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3028,15 +3028,15 @@ msgstr "Izvēlieties ierakstu, kurš vislabāk raksturo Jūsu interneta savienoj msgctxt "ServerPage" msgid "Show help topic on bandwidth rate limits" -msgstr "" +msgstr "Parādīt palīdzības tematu par pārraides joslas platumu robežām" msgctxt "ServerPage" msgid "Average Rate" -msgstr "" +msgstr "Datu pārraides vidējais ātrums" msgctxt "ServerPage" msgid "Long-term average bandwidth limit" -msgstr "" +msgstr "Joslas platuma vidējā ilgtermiņa robeža" msgctxt "ServerPage" msgid "KB/s" @@ -3044,21 +3044,21 @@ msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" -msgstr "" +msgstr "Datu pārraides maksimālais ātrums" msgctxt "ServerPage" msgid "Peak bandwidth rate limit" -msgstr "" +msgstr "Joslas platuma maksimālās robežas" msgctxt "ServerPage" msgid "" "Your maximum bandwidth rate must be greater than or equal to your average " "bandwidth rate. Both values must be at least 20 KB/s." -msgstr "" +msgstr "Jūsu joslas platuma maksimālajām robežām jābūt lielākām vai vienādām par Jūsu datu pārraides vidējo ātrumu. Abiem lielumiem ir jābūt vismaz 20 kb/s lieliem." msgctxt "ServerPage" msgid "Bandwidth Limits" -msgstr "" +msgstr "Joslas platuma robežas" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" @@ -3066,7 +3066,7 @@ msgstr "Porti 6660 - 6669 un 6697" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Tērzēšanas retrlanslēšana internetā (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" @@ -3074,15 +3074,15 @@ msgstr "Porti 110, 143, 993 un 995" msgctxt "ServerPage" msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "Izgūt pastu (POP, IMAP)" msgctxt "ServerPage" msgid "Ports unspecified by other checkboxes" -msgstr "" +msgstr "Citu izvēles rūtiņu nenorādīti porti" msgctxt "ServerPage" msgid "Misc Other Services" -msgstr "" +msgstr "Dažādi citi pakalpojumi" msgctxt "ServerPage" msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888" @@ -3090,7 +3090,7 @@ msgstr "Porti 706, 1863, 5050, 5190, 5222, 5223, 8300 un 8888" msgctxt "ServerPage" msgid "Instant Messaging (IM)" -msgstr "" +msgstr "Tūlītēja ziņojumapmaiņa (IM)" msgctxt "ServerPage" msgid "Port 443"

1 0

[metrics-tasks/master] Parse files while reading them from disk.
by karsten＠torproject.org 08 Nov '12

08 Nov '12

commit 3f7a92bd86e73d26ef989d095442a5a2249d0daa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 8 09:56:35 2012 -0500 Parse files while reading them from disk. Suggested by atagar. --- task-6471/python/pygeodate.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/task-6471/python/pygeodate.py b/task-6471/python/pygeodate.py index f9525f0..34ee7da 100644 --- a/task-6471/python/pygeodate.py +++ b/task-6471/python/pygeodate.py @@ -41,7 +41,7 @@ class Database: def load_combined_databases(self, path): with open(path) as input_file: - for line in input_file.readlines(): + for line in input_file: line = line.strip() if line.startswith('!'): date = line.split("!")[1] @@ -86,7 +86,7 @@ if __name__ == "__main__": db = Database() db.load_combined_databases('geoip-2007-10-2012-09.csv') with open('test-cases-2007-10-2012-09.csv') as input_file: - for line in input_file.readlines(): + for line in input_file: line = line.strip() parts = line.split(',') address_string = parts[0]

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 08 Nov '12

08 Nov '12

commit 6a16aab106cba6dcfd1990f3a4a2ac9c9da016f2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 8 14:45:20 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 2b900b6..70f9944 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,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:46+0000\n" -"PO-Revision-Date: 2012-11-03 14:19+0000\n" +"PO-Revision-Date: 2012-11-08 14:44+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2996,35 +2996,35 @@ msgctxt "ServerPage" msgid "" "For Internet connections with fast download speed but slow upload, please " "list your upload speed here." -msgstr "" +msgstr "Interneta savienojumiem, kuriem ir liels lejuplādes ātrums un mazs augšuplādes ātrums, lūdzu norādiet savu augšuplādes ātrumu." msgctxt "ServerPage" msgid "Cable/DSL 256 Kbps" -msgstr "" +msgstr "Kabelis/DSL 256 kbps" msgctxt "ServerPage" msgid "Cable/DSL 512 Kbps" -msgstr "" +msgstr "Kabelis/DSL 512 kbps" msgctxt "ServerPage" msgid "Cable/DSL 768 Kbps" -msgstr "" +msgstr "Kabelis/DSL 768 kbps" msgctxt "ServerPage" msgid "T1/Cable/DSL 1.5 Mbps" -msgstr "" +msgstr "T1/Kabelis/DSL 1,5 Mbps" msgctxt "ServerPage" msgid "> 1.5 Mbps" -msgstr "" +msgstr "> 1,5 Mbps" msgctxt "ServerPage" msgid "Custom" -msgstr "" +msgstr "Pielāgots" msgctxt "ServerPage" msgid "Select the entry that most closely resembles your Internet connection" -msgstr "" +msgstr "Izvēlieties ierakstu, kurš vislabāk raksturo Jūsu interneta savienojuma ātrumu" msgctxt "ServerPage" msgid "Show help topic on bandwidth rate limits"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 08 Nov '12

08 Nov '12

commit caad63808f4472bf6faf4e3cedfe386d9d2d5678 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 8 13:15:25 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 56 +++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 0328656..35ba448 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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:46+0000\n" -"PO-Revision-Date: 2012-11-08 00:20+0000\n" +"PO-Revision-Date: 2012-11-08 13:14+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" @@ -172,13 +172,13 @@ msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." -msgstr "La localización idiomática especificada en el archivo de configuración de Tor contiene caracteres que no se pueden representar en la codificación de caracteres de 8 bits actual de su sistema ." +msgstr "La localización regional especificada en el archivo de configuración de Tor (torrc) contiene caracteres que no se pueden representar en la codificación de caracteres de 8 bits actual de su sistema. " msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." -msgstr "La localización idiomática especificada en la carpeta d ubicación especificada del directorio contiene caracteres que no se puede representar en la codificación de caracteres de 8 bits actual de su sistema. " +msgstr "La localización regional especificada en la carpeta de datos de Tor contiene caracteres que no se puede representar en la codificación de caracteres de 8 bits actual de su sistema. " msgctxt "AdvancedPage" msgid "Warning" @@ -186,15 +186,15 @@ msgstr "Advertencia " msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "Ha cambiado la ruta de torrc, ¿le gustaría reiniciar Tor?" +msgstr "Ha cambiado la ruta de torrc, ¿le gustaría reiniciar Tor? " msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "Archivo de configuración Tor (torrc);;todos los archivos (*)" +msgstr "Archivo de Configuración Tor (torrc);;Todos los Archivos (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "Selecciona un archivo para su uso vía la ruta del Tor socket" +msgstr "Seleccione un archivo a usar para la ruta del socket de Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" @@ -235,7 +235,7 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "Vidalia no fue capaz de eliminar el servicio de Tor.\n\nPuede que necesite eliminarlo de manera manual." +msgstr "Vidalia no fue capaz de eliminar el servicio de Tor. \n \nPuede que necesite eliminarlo de manera manual. " msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" @@ -243,23 +243,23 @@ msgstr "Selecciones un Directorio para usarlo como Panico" msgctxt "AppearancePage" msgid "Language" -msgstr "Idioma" +msgstr "Idioma " msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "Seleccione el idioma usado por Vidalia" +msgstr "Seleccione el idioma usado por Vidalia " msgctxt "AppearancePage" msgid "Style" -msgstr "Estilo" +msgstr "Estilo " msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "Escoja el estilo de la interfaz de Vidalia" +msgstr "Escoja el estilo de la interfaz de Vidalia " msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." -msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado." +msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado. " msgctxt "AppearancePage" msgid "" @@ -280,39 +280,39 @@ msgstr "Ocultar el icono de Dock" msgctxt "BandwidthGraph" msgid "Since:" -msgstr "Desde:" +msgstr "Desde: " msgctxt "BandwidthGraph" msgid "Hide Settings" -msgstr "Ocultar Preferencias" +msgstr "Ocultar Preferencias " msgctxt "BandwidthGraph" msgid "Show Settings" -msgstr "Mostrar Preferencias" +msgstr "Mostrar Preferencias " msgctxt "BandwidthGraph" msgid "Reset" -msgstr "Reiniciar" +msgstr "Reiniciar " msgctxt "BandwidthGraph" msgid "Receive Rate" -msgstr "Tasa de Recepción" +msgstr "Tasa de Recepción " msgctxt "BandwidthGraph" msgid "Send Rate" -msgstr "Tasa de Envío" +msgstr "Tasa de Envío " msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "Siempre Arriba" +msgstr "Siempre Arriba " msgctxt "BandwidthGraph" msgid "Style" -msgstr "Estilo" +msgstr "Estilo " msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "Cambia la transparencia del Gráfico de Ancho de Banda" +msgstr "Cambia la transparencia del Gráfico de Ancho de Banda " msgctxt "BandwidthGraph" msgid "100" @@ -332,27 +332,27 @@ msgstr "Cancelar" msgctxt "BandwidthGraph" msgid "Bandwidth Graph" -msgstr "Ancho de banda gráfico" +msgstr "Gráfico de Ancho de Banda " msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando la solicitud de puente HTTPS." +msgstr "Iniciando la solicitud de bridge (puente a Tor no propagado) HTTPS... " msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." -msgstr "Conectando a %1:%2..." +msgstr "Conectando a %1:%2... " msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Enviando una solicitud HTTPS para puentes." +msgstr "Enviando una solicitud HTTPS para briges (puentes a Tor no propagados)... " msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "Descargando una lista de puentes..." +msgstr "Descargando una lista de bridges (puentes a Tor no propagados)... " msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Descargando puentes" +msgstr "Descargando bridges (puentes a Tor no propagados)" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" @@ -360,7 +360,7 @@ msgstr "No pudo descargar puentes: %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Reintentando la solicitud de puentes..." +msgstr "Reintentando la solicitud de bridges (puentes a Tor no propagados)... " msgctxt "BridgeUsageDialog" msgid "Country"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 08 Nov '12

08 Nov '12

commit bffbdb17d3ac68779f154b3cf1ed3c772a022a92 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 8 13:15:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 56 +++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 0328656..35ba448 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,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:46+0000\n" -"PO-Revision-Date: 2012-11-08 00:20+0000\n" +"PO-Revision-Date: 2012-11-08 13:14+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" @@ -172,13 +172,13 @@ msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." -msgstr "La localización idiomática especificada en el archivo de configuración de Tor contiene caracteres que no se pueden representar en la codificación de caracteres de 8 bits actual de su sistema ." +msgstr "La localización regional especificada en el archivo de configuración de Tor (torrc) contiene caracteres que no se pueden representar en la codificación de caracteres de 8 bits actual de su sistema. " msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." -msgstr "La localización idiomática especificada en la carpeta d ubicación especificada del directorio contiene caracteres que no se puede representar en la codificación de caracteres de 8 bits actual de su sistema. " +msgstr "La localización regional especificada en la carpeta de datos de Tor contiene caracteres que no se puede representar en la codificación de caracteres de 8 bits actual de su sistema. " msgctxt "AdvancedPage" msgid "Warning" @@ -186,15 +186,15 @@ msgstr "Advertencia " msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "Ha cambiado la ruta de torrc, ¿le gustaría reiniciar Tor?" +msgstr "Ha cambiado la ruta de torrc, ¿le gustaría reiniciar Tor? " msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "Archivo de configuración Tor (torrc);;todos los archivos (*)" +msgstr "Archivo de Configuración Tor (torrc);;Todos los Archivos (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "Selecciona un archivo para su uso vía la ruta del Tor socket" +msgstr "Seleccione un archivo a usar para la ruta del socket de Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" @@ -235,7 +235,7 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "Vidalia no fue capaz de eliminar el servicio de Tor.\n\nPuede que necesite eliminarlo de manera manual." +msgstr "Vidalia no fue capaz de eliminar el servicio de Tor. \n \nPuede que necesite eliminarlo de manera manual. " msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" @@ -243,23 +243,23 @@ msgstr "Selecciones un Directorio para usarlo como Panico" msgctxt "AppearancePage" msgid "Language" -msgstr "Idioma" +msgstr "Idioma " msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "Seleccione el idioma usado por Vidalia" +msgstr "Seleccione el idioma usado por Vidalia " msgctxt "AppearancePage" msgid "Style" -msgstr "Estilo" +msgstr "Estilo " msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "Escoja el estilo de la interfaz de Vidalia" +msgstr "Escoja el estilo de la interfaz de Vidalia " msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." -msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado." +msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado. " msgctxt "AppearancePage" msgid "" @@ -280,39 +280,39 @@ msgstr "Ocultar el icono de Dock" msgctxt "BandwidthGraph" msgid "Since:" -msgstr "Desde:" +msgstr "Desde: " msgctxt "BandwidthGraph" msgid "Hide Settings" -msgstr "Ocultar Preferencias" +msgstr "Ocultar Preferencias " msgctxt "BandwidthGraph" msgid "Show Settings" -msgstr "Mostrar Preferencias" +msgstr "Mostrar Preferencias " msgctxt "BandwidthGraph" msgid "Reset" -msgstr "Reiniciar" +msgstr "Reiniciar " msgctxt "BandwidthGraph" msgid "Receive Rate" -msgstr "Tasa de Recepción" +msgstr "Tasa de Recepción " msgctxt "BandwidthGraph" msgid "Send Rate" -msgstr "Tasa de Envío" +msgstr "Tasa de Envío " msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "Siempre Arriba" +msgstr "Siempre Arriba " msgctxt "BandwidthGraph" msgid "Style" -msgstr "Estilo" +msgstr "Estilo " msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "Cambia la transparencia del Gráfico de Ancho de Banda" +msgstr "Cambia la transparencia del Gráfico de Ancho de Banda " msgctxt "BandwidthGraph" msgid "100" @@ -332,27 +332,27 @@ msgstr "Cancelar" msgctxt "BandwidthGraph" msgid "Bandwidth Graph" -msgstr "Ancho de banda gráfico" +msgstr "Gráfico de Ancho de Banda " msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando la solicitud de puente HTTPS." +msgstr "Iniciando la solicitud de bridge (puente a Tor no propagado) HTTPS... " msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." -msgstr "Conectando a %1:%2..." +msgstr "Conectando a %1:%2... " msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Enviando una solicitud HTTPS para puentes." +msgstr "Enviando una solicitud HTTPS para briges (puentes a Tor no propagados)... " msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "Descargando una lista de puentes..." +msgstr "Descargando una lista de bridges (puentes a Tor no propagados)... " msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Descargando puentes" +msgstr "Descargando bridges (puentes a Tor no propagados)" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" @@ -360,7 +360,7 @@ msgstr "No pudo descargar puentes: %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "Reintentando la solicitud de puentes..." +msgstr "Reintentando la solicitud de bridges (puentes a Tor no propagados)... " msgctxt "BridgeUsageDialog" msgid "Country"

1 0

[ooni-probe/master] * Removed unused code from assertions.py.
by isis＠torproject.org 08 Nov '12

08 Nov '12

commit 98358b37463e68e03060b8917db78ee4055f1189 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 8 08:25:00 2012 +0000 * Removed unused code from assertions.py. * Deleted config.py and process.py. --- wtf/assertions.py | 72 ---------------------------------------------------- wtf/config.py | 66 ----------------------------------------------- wtf/process.py | 73 ----------------------------------------------------- 3 files changed, 0 insertions(+), 211 deletions(-) diff --git a/wtf/assertions.py b/wtf/assertions.py index 875dcf5..60d3c50 100644 --- a/wtf/assertions.py +++ b/wtf/assertions.py @@ -10,78 +10,6 @@ # :copyright: 2012 Isis Lovecruft, The Tor Project Inc. # -class ValueChecker(object): - """ - A class for general purpose value checks on commandline parameters - passed to subclasses of :class:`twisted.python.usage.Options`. - """ - default_doc = "fix me" - - def __init__(self, coerce_doc=None): - if not coerce_doc: - self.coerce_doc = default_doc - else: - self.coerce_doc = coerce_doc - - @classmethod - def port_check(cls, port, - range_min=1024, range_max=65535, - coerce_doc=None): - """ - Check that given ports are in the allowed range for an unprivileged - user. - - :param port: - The port to check. - :param range_min: - The minimum allowable port number. - :param range_max: - The minimum allowable port number. - :param coerce_doc: - The documentation string to show in the optParameters menu, see - :class:`twisted.python.usage.Options`. - """ - if not coerce_doc: - coerceDoc = cls.default_doc - - assert isinstance(port, int) - if port not in range(range_min, range_max): - raise ValueError("Port out of range") - log.err() - - @staticmethod - def uid_check(error_message): - """ - Check that we're not root. If we are, setuid(1000) to normal user if - we're running on a posix-based system, and if we're on Windows just - tell the user that we can't be run as root with the specified options - and then exit. - - :param error_message: - The string to log as an error message when the uid check fails. - """ - uid, gid = os.getuid(), os.getgid() - if uid == 0 and gid == 0: - log.msg(error_message) - if os.name == 'posix': - log.msg("Dropping privileges to normal user...") - os.setgid(1000) - os.setuid(1000) - else: - sys.exit(0) - - @staticmethod - def dir_check(d): - """Check that the given directory exists.""" - if not os.path.isdir(d): - raise ValueError("%s doesn't exist, or has wrong permissions" % d) - - @staticmethod - def file_check(f): - """Check that the given file exists.""" - if not os.path.isfile(f): - raise ValueError("%s does not exist, or has wrong permissions" % f) - def isNewStyleClass(obj): """ Check if :param:`obj` is a new-style class, which is any class diff --git a/wtf/config.py b/wtf/config.py deleted file mode 100644 index 25f9576..0000000 --- a/wtf/config.py +++ /dev/null @@ -1,66 +0,0 @@ -class ValueChecker(object): - """ - A class for general purpose value checks on commandline parameters - passed to subclasses of :class:`twisted.python.usage.Options`. - """ - def __init__(self, coerce_doc=None): - self.coerce_doc = coerce_doc - - def port_check(self, port, range_min=1024, range_max=65535): - """ - Check that given ports are in the allowed range for an unprivileged - user. - - :param port: - The port to check. - :param range_min: - The minimum allowable port number. - :param range_max: - The minimum allowable port number. - :param coerce_doc: - The documentation string to show in the optParameters menu, see - :class:`twisted.python.usage.Options`. - """ - if self.coerce_doc is not None: - coerceDoc = self.coerce_doc - - assert type(port) is int - if port not in range(range_min, range_max): - raise ValueError("Port out of range") - log.err() - - @staticmethod - def uid_check(error_message): - """ - Check that we're not root. If we are, setuid(1000) to normal user if - we're running on a posix-based system, and if we're on Windows just - tell the user that we can't be run as root with the specified options - and then exit. - - :param error_message: - The string to log as an error message when the uid check fails. - """ - uid, gid = os.getuid(), os.getgid() - if uid == 0 and gid == 0: - log.msg(error_message) - if os.name == 'posix': - log.msg("Dropping privileges to normal user...") - os.setgid(1000) - os.setuid(1000) - else: - sys.exit(0) - - @staticmethod - def dir_check(d): - """Check that the given directory exists.""" - if not os.path.isdir(d): - raise ValueError("%s doesn't exist, or has wrong permissions" - % d) - - @staticmethod - def file_check(f): - """Check that the given file exists.""" - if not os.path.isfile(f): - raise ValueError("%s does not exist, or has wrong permissions" - % f) - diff --git a/wtf/process.py b/wtf/process.py deleted file mode 100644 index 25d6368..0000000 --- a/wtf/process.py +++ /dev/null @@ -1,73 +0,0 @@ -# -# process.py -# ---------- -# OONI utilities for dealing with starting and stopping processes. -# -# :author: Isis Lovecruft -# :version: 0.1.0-pre-alpha -# :license: see include LICENSE file -# :copyright: copyright (c) 2012, Isis Lovecruft, The Tor Project Inc. -# - -from twisted.internet import defer - -(a)defer.inlineCallbacks -def singleton_semaphore(deferred_process_init, - callbacks=[], errbacks=[], - max_inits=1): - """ - Initialize a process only once, and do not return until - that initialization is complete. If the keyword parameter max_inits= - is given, run the process a maximum of that number of times. - - :param deferred_process_init: - A deferred which returns a connected process via - :meth:`twisted.internet.reactor.spawnProcess`. - :param callbacks: - A list of callback functions to add to the initialized processes' - deferred. - :param errbacks: - A list of errback functions to add to the initialized processes' - deferred. - :param max_inits: - An integer specifying the maximum number of allowed - initializations for :param:deferred_process_init. If no maximum - is given, only one instance (a singleton) of the process is - initialized. - :return: - The final state of the :param deferred_process_init: after the - callback chain has completed. This should be a fully initialized - process connected to a :class:`twisted.internet.reactor`. - """ - assert isinstance(callbacks, list) - assert isinstance(errbacks, list) - assert isinstance(max_inits, int) - - for cb in callbacks: - deferred_process_init.addCallback(cb) - for eb in errbacks: - deferred_process_init.addErrback(eb) - - only_this_many = defer.DeferredSemaphore(max_inits) - singleton = yield only_this_many.run(deferred_process_init) - defer.returnValue(singleton) - -class Singleton(object): - """ - Generic Class for creating Singleton subclasses. - - Subclass me to create a singleton class, which will only ever have one - instance, regardless of how many times the subclass constructor is called. - - Any subclass of me should override ``init`` rather than ``__init__``, - because the latter is called whenever the constructor is called. - """ - def __new__(cls, *args, **kwds): - it = cls.__dict__.get("__it__") - if it is not None: - return it - cls.__it__ = it = object.__new__(cls) - it.init(*args, **kwds) - return it - def init(self, *args, **kwds): - pass

1 0

[ooni-probe/master] * Moved metaclass code to separate branch 'meta'.
by isis＠torproject.org 08 Nov '12

08 Nov '12

commit 16d270968cd1d52a081b3c653312b1e4b029dd9f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 8 08:32:43 2012 +0000 * Moved metaclass code to separate branch 'meta'. --- wtf/README | 9 -- wtf/assertions.py | 108 ------------------------ wtf/meta.py | 241 ----------------------------------------------------- wtf/timer.py | 107 ----------------------- 4 files changed, 0 insertions(+), 465 deletions(-) diff --git a/wtf/README b/wtf/README deleted file mode 100644 index 7696130..0000000 --- a/wtf/README +++ /dev/null @@ -1,9 +0,0 @@ -I have moved here all the pieces of code that are either not being used -anywhere or that should probably not be part of OONIProbe. - -They are very neat pieces of code, though I have not tester their -functionality, since there are no examples of how they should be called or -used in the repo. - -I believe they should go on a separate branch or on another repo called -something like "python class kung foo". diff --git a/wtf/assertions.py b/wtf/assertions.py deleted file mode 100644 index 60d3c50..0000000 --- a/wtf/assertions.py +++ /dev/null @@ -1,108 +0,0 @@ -#-*- coding: utf-8 -*- -# -# assertions.py -# ------------- -# Collection of utilies for checks and assertions. -# -# :authors: Isis Lovecruft -# :version: 0.1.0-alpha -# :license: see included LICENSE file -# :copyright: 2012 Isis Lovecruft, The Tor Project Inc. -# - -def isNewStyleClass(obj): - """ - Check if :param:`obj` is a new-style class, which is any class - derived by either - - NewStyleClass = type('NewStyleClass') - or - class NewStyleClass(object): - pass - - whereas old-style classes are (only in Python 2.x) derived by: - - class OldStyleClass: - pass - - There are recently implemented classes in many Python libraries, - including a few in Twisted, which are derived from old-style classes. - Thus, calling super() or attempting to retrieve the MRO of any - subclass of old-style classes can cause issues such as: - - o Calling Subclass.mro() goes through the class hierarchy until it - reaches OldStyleClass, which has no mro(), and raises an - AttributeError. - - o Calling super(Subclass, subcls) produces an ambiguous, rather than - algorithmic, class hierarchy, which (especially in Twisted's case) - breaks multiple inheritance. - - o Expected Subclass instance attributes, in particular __bases__ and - __class__, can be missing, which in turn leads to problems with - a whole bunch of builtin methods and modules. - - For more information, see: - http://www.python.org/download/releases/2.3/mro/ - http://www.cafepy.com/article/python_attributes_and_methods/ - - :return: - True if :param:`obj` is a new-style class derived from object; - False if :param:`obj` is an old-style class (or derived from - one). - """ - from types import ClassType - return not isinstance(type(object), ClassType) - -def isOldStyleClass(obj): - """ - Check if :param:`obj` is an old-style class, which is any class - derived in Python 2.x with: - - class OldStyleClass: - pass - - There are recently implemented classes in many Python libraries, - including a few in Twisted, which are derived from old-style classes, - and thus their types, bases, and attributes are generally just messed - up. - - :return: - True if :param:`obj` is a new-style class derived from object; - False if :param:`obj` is an old-style class (or derived from - one). - """ - from types import ClassType - return not isinstance(type(object), ClassType) - -def isClass(obj): - """ - Check if an object is *a* class (not a specific class), without trying - to call the obj.__class__ attribute, as that is not available in some - cases. This function will return True for both old- and new-style - classes, however, it will return False for class instances of either - style. An alternate way to do this (although it presumes that - :param:`obj` is a class instance) would be: - - from types import TypeType - return isinstance(object.__class__, TypeType) - - It turns out that objects with <type 'type'>, i.e. classes, don't - actually have the __class__ attribute...go figure. Instead, class - objects are only required to have the __doc__ and __module__ - attributes. - - :param obj: - Any object. - :return: - True if :param:`obj` is a class, False if otherwise (even if - :param:`obj` is an instance of a class). - """ - from types import ClassType - return isinstance(object, (type, ClassType)) - -def isNotClass(object): - """ - See :func:`isClass`. - """ - return True if not isClass(object) else False diff --git a/wtf/meta.py b/wtf/meta.py deleted file mode 100644 index 0b810f7..0000000 --- a/wtf/meta.py +++ /dev/null @@ -1,241 +0,0 @@ -#-*- coding: utf-8 -*- -# -# meta.py -# ------- -# Meta classes for coercing subclasses which don't exist yet. -# -# :authors: Isis Lovecruft -# :version: 0.1.0-alpha -# :copyright: 2012 Isis Lovecruft -# :license: see attached LICENSE file -# - -class MetaDescriptor(type): - """ - bug: "Attribute error: class <> has no attribute __bases__" - - There are only objects. However, there *are* two kinds of objects: - type-objects and non-type-objects. - - There are only two objects which do not have an attribute named - "__bases__": - - 1) Instances of the builtin object ``object`` itself (i.e. the - superclass of any top-level class in python), whose __class__ is - itself, and whose type is ``type(type)``: - - >>> o = object() - >>> type(o) - <type 'type'> - >>> o.__class__ - <type 'object'> - - The o.__class__ part seems to imply that the __bases__ of - ``object`` should be itself. - - 2) Old Style Classes. Which are despicable demons, deserving to be - sent straight back to hell. No offense to the good Satanas. The - only thing these have by default is __doc__ and __module__. Also, - and this is importants too: Old Style Classes do not have an - attribute named __class__, because they do not derive from - anything. - - Incidentally, the type of ``type(type)`` is itself, and the "__bases__" of - ``type(type)`` is... - - >>> t = type(type) - >>> t.__name__ - 'type' - >>> type(t) - <type 'type'> - >>> t.__class__ - <type 'type'> - >>> t.__bases__ - (<type 'object'>,) - - ``type(object)``. WTF. This is to say that the "__bases__" of ``object`` - is the ``type`` of itself. This strange loop is where all black magic - enters into Python. - - If we do "class Metaclass(type): pass", we can then call - ``super(Metaclass, mcls)``, and the resulting ``super`` object is actually - just ``type``: - - o Its type is ``type(type)``. - o Its __bases__ ``type(object)``. - - For example, ``super(Metaclass, mcls).__new__(mcls, *a, *kw)`` is the same - as saying ``type(mcls, "Metaclass", (type, ), {} )``, except that super - does some namespace munging with calling "self.__super" on its own type, - which is probably equivalent to the strange loops with type(type) and - type(object), but my brain is already flipping out (and I keep a string - cosmology textbook on my nightstand!). - - However, we should not ever be able to call - - >>> super(type, type(mcls)).__new__(type(mcls), 'type', (type(type),) {} ) - TypeError: object.__new__(type) is not safe, use type.__new__() - - Q: Why all this fuss? - - A: We need to force future class-level attributes of subclasses of - NetTestCase to be accessible (also at the class-level, without - instatiations) by NetTestCase. I.e.: - 1) class SubNetTestCase has class attribute optParameters, but no - class for doing anything with them, and they shouldn't have to. - They should just be able to define the options. - 2) Therefore, NetTestCase needs to have data descriptors, which get - inherited. - 3) We need to be able to do this without dangerous namespace - munging, because we cannot control the namespace of future - tests. Therefore, we cannot use hacks like "self.__super". - - We need a Metaclass, which creates a Metafactory for classes which are - dynamic test descriptors. If this is confusing, leave it alone, there's - witches is these woods. - - http://stackoverflow.com/a/10707719 - http://docs.python.org/2/howto/descriptor.html - http://www.no-ack.org/2011/03/strange-behavior-with-properties-on.html - http://www.cafepy.com/article/python_types_and_objects/ - http://stackoverflow.com/questions/100003/what-is-a-metaclass-in-python - - """ - ## DO NOT GIVE A METACLASS ATTRIBUTES HERE. - #descriptors = { } - - from byteplay import Code, opmap - from functools import partial - - def __new__(im_so_meta_even_this_acronym, name, base, dict): - - def hofstaeder_decorator(meta_decorator): - def meta_decorator_factory(*args, **kwargs): - def meta_decorator_wrapper(func): - return meta_decorator(func, *args, **kwargs) - return meta_decorator_wrapper - return meta_decorator_factory - - def _transmute(opcode, arg): - if ((opcode == opmap['LOAD_GLOBAL']) and - (arg == 'self')): - return opmap['LOAD_FAST'], arg - return opcode, arg - - def selfless(child): - code = Code.from_code(child.func_code) - code.args = tuple(['self'] + list(code.args)) - code.code = [_transmute(op, arg) for op, arg in code.code] - function.func_code = code.to_code() - return function - - acronym = ( ( k,v ) for k,v in dict.items( ) - if not k.startswith('__') ) - metanym, polymorph = ( (k for ( k,v ) in acronym), - (v for ( k,v ) in acronym) ) - morphonemes = (("get%s"%n, "set%s"%n, "del%s"%n) for n in metanym ) - - oracles = [] - for getter, setter, deleter in morphonemes: - childnym = getter[3:] - - @hofstaeder_decorator - def meta_decorator(func, *args, **kwargs): - def decorator_wrapper(first, last): - return func(first, last) - return decorator_wrapper - - @meta_decorator(getter, setter, deleter) - def decorated_property(first, last): - childnym = getter[3:] - class DataDescriptor(object): - @selfless - def __init__(childnym=None, polymorph): - setattr(self, childnym, polymorph) - - @property - @selfless - def getter(): - return self.childnym - return DataDescriptor(first, last) - - oracles.append(decorated_property(childnym, polymorph)) - - return super( - MetaDescriptor, im_so_meta_even_this_acronym).__new__( - im_so_meta_even_this_acronym, - metanym, - polymorph, - dict(oracles) ) -''' - @property - def x(self): ## or getx - return self._x - @x.setter - def x(self, value): ## or setx - self._x = value - @x.deleter - def x(self): ## or delx - del self._x - ## or 'x = property(getx, setx, delx, "documentation")' - ## ^ ^ ^ ^ - ## just need @property's name, initial value can be None - -Metaclass - Creates Metaclasses for each data descriptor in each SubNetTestCase - so, per SubNetTestCase, we get (usually two) descriptors: - optParameters and input - -''' - -def applyClassAttribute(obj, cls, get='optParameters'): - """ - I get attributes from an outside instances' dictionary and attempt to - apply them to a class. I require that the attributes I am trying to set be - data descriptors which is just Python name munging trick that is mild and - harmless enough to have it's own builtin decorator helper: - - class Foo(object): - def __init__(self, *a, **kw): - if 'thing' in kw: - self._thing = thing - @property - def thing(self): - return self._thing - @property.setter - def thing(self, value): - self._thing = value - @property.delter - def thing(self): - return del(self) - """ - from ooni.utils.assertions import isClass, isNotClass - - try: - assert isNotClass(obj), "must be an instance" - assert isClass(cls), "not a class" - ## obj is probably an instance - C = obj.__class__ ## of a subclass of nettest.NetTestCase - - assert issubclass(C, cls), "not a subclass of %s" % cls - assert C.__dict__.__contains__('optParameters'), \ - "%s in %s.__dict__ not found" % (get, C) - except AssertionError, ae: - log.debug(ae) - else: - attributes = classify_class_attrs(C) - ## uncomment this to have class attributes spewn everywhere: - #log.debug("Found class attributes:\n%s" % pprint(attributes)) - for attr in attributes: - if attr.name == str(get): - setattr(obj, str(get), attr.object) - if not hasattr(obj, str(get)): - log.debug("Unable to find class attribute %s" % get) - else: - log.debug("Applying %s.%s = %s to descriptor..." - % (C.name, attr.name, attr.object)) - ## This was an unfinished attempt at fixing a class' __bases__, I do - ## not know if it was heading in the right direction. It can be - ## removed it is still crufting up the space. --isis - if '__bases__' or '_parents' in C.__dict__: - pass diff --git a/wtf/timer.py b/wtf/timer.py deleted file mode 100644 index e03fd74..0000000 --- a/wtf/timer.py +++ /dev/null @@ -1,107 +0,0 @@ -# -# timer.py -# ---------- -# OONI utilities for adding timeouts to functions and to Deferreds. -# -# :author: Isis Lovecruft -# :version: 0.1.0-pre-alpha -# :license: see include LICENSE file -# :copyright: copyright (c) 2012, Isis Lovecruft, The Tor Project Inc. -# - -class TimeoutError(Exception): - """Raised when a timer runs out.""" - pass - -def timeout(seconds, e=None): - """ - A decorator for blocking methods to cause them to timeout. Can be used - like this: - - @timeout(30) - def foo(arg1, kwarg="baz"): - for x in xrange(1000000000): - print "%s %s" % (arg1, kwarg) - print x - - or like this: - - ridiculous = timeout(30)(foo("bar")) - - :param seconds: - Number of seconds to wait before raising :class:`TimeoutError`. - :param e: - Error message to pass to :class:`TimeoutError`. Default None. - :return: - The result of the original function, or else an instance of - :class:`TimeoutError`. - """ - from signal import alarm, signal, SIGALRM - from functools import wraps - - def decorator(func): - def _timeout(signum, frame): - raise TimeoutError, e - def wrapper(*args, **kwargs): - signal(SIGALRM, _timeout) - alarm(seconds) - try: - res = func(*args, **kwargs) - finally: - alarm(0) - return res - return wraps(func)(wrapper) - return decorator - -def deferred_timeout(seconds, e=None): - """ - Decorator for adding a timeout to an instance of a - :class:`twisted.internet.defer.Deferred`. Can be used like this: - - @deferred_timeout(30) - def foo(arg1, kwarg="baz"): - for x in xrange(1000000000): - print "%s %s" % (arg1, kwarg) - print x - - or like this: - - ridiculous = deferred_timeout(30)(foo("bar")) - - :param seconds: - Number of seconds to wait before raising :class:`TimeoutError`. - :param e: - Error message to pass to :class:`TimeoutError`. Default None. - :return: - The result of the orginal :class:`twisted.internet.defer.Deferred` - or else a :class:`TimeoutError`. - """ - from twisted.internet import defer, reactor - - def wrapper(func): - @defer.inlineCallbacks - def _timeout(*args, **kwargs): - d_original = func(*args, **kwargs) - if not isinstance(d_original, defer.Deferred): - defer.returnValue(d_original) ## fail gracefully - d_timeout = defer.Deferred() - timeup = reactor.callLater(seconds, d_timeout.callback, None) - try: - original_result, timeout_result = \ - yield defer.DeferredList([d_original, d_timeout], - fireOnOneCallback=True, - fireOnOneErrback=True, - consumeErrors=True) - except defer.FirstError, dfe: - assert dfe.index == 0 ## error in original - timeup.cancel() - dfe.subFailure.raiseException() - else: - if d_timeout.called: ## timeout - d_original.cancel() - raise TimeoutError, e - timeup.cancel() ## no timeout - defer.returnValue(d_original) - return _timeout - return wrapper -

1 0

[ooni-probe/master] * Changed runner.getTestOptions() to return the localoptions, in addition to setting them as an attribute.
by isis＠torproject.org 08 Nov '12

08 Nov '12

commit c342c61e8ef0f7d79300054823d788ef1f4af878 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 5 14:02:49 2012 +0000 * Changed runner.getTestOptions() to return the localoptions, in addition to setting them as an attribute. --- ooni/runner.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index d711153..52c6596 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -104,11 +104,13 @@ def getTestOptions(cls, subargs): raise Exception("This test requires root to run") try: - cls.buildOptions(subargs) + local_opts = cls.buildOptions(subargs) except Exception, e: log.err(e) - return cls.local_options + log.debug("getTestOptions: local_options = %s" % local_opts) + + return local_opts def loadTestsAndOptions(classes, config): """ @@ -240,7 +242,6 @@ class ORunner(object): log.debug("ORunner: cases=%s" % type(cases)) log.debug("ORunner: options=%s" % options) - try: first = options.pop(0) except: @@ -258,8 +259,7 @@ class ORunner(object): filename = 'report_'+date.timestamp()+'.yaml' reportFile = open(filename, 'a+') self.reporterFactory = ReporterFactory( - reportFile, testSuite=self.baseSuite(self.cases) - ) + reportFile, testSuite=self.baseSuite(self.cases)) def runWithInputUnit(self, input_unit): idx = 0

1 0