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

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Nov '12

04 Nov '12

commit c4e0a896f9ef1cba1bb18a5e247a6cb5df01a725 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 19:45:08 2012 +0000 Update translations for orbot --- values-es/strings.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index ca6bc9a..c8e629d 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -135,12 +135,12 @@ <string name="pref_proxy_type_title">Tipo de Proxy Saliente (a internet, no a Tor) </string> <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, SOCKS4, SOCKS5 </string> <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string> - <string name="pref_proxy_host_title">Servidor Proxy Saliente (a internet, no a Tor) </string> - <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente </string> + <string name="pref_proxy_host_title">Servidor Proxy Saliente</string> + <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente (a internet, no a Tor) </string> <string name="pref_proxy_host_dialog">Introduzca la dirección del proxy </string> <string name="pref_proxy_port_title">Puerto del Proxy Saliente </string> <string name="pref_proxy_port_summary">Puerto del servidor proxy saliente (a internet, no a Tor) </string> - <string name="pref_proxy_port_dialog">Introduzca el puerto para el proxy </string> + <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy </string> <string name="status">Estado </string> <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string> <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string> @@ -155,9 +155,9 @@ <string name="bridge_requires_ip">Para utilizar la funcion bridge (puente en sombra con la red Tor), debe introducir al menos una dirección IP de bridge. </string> <string name="send_email_for_bridges">Envie un correo a bridges(a)torproject.org sólo con el texto \"get bridges\" en el cuerpo del mensaje, desde una cuenta de gmail. </string> <string name="error">Error </string> - <string name="your_reachableaddresses_settings_caused_an_exception_">¡Su configuración de ReachableAddresses (direcciones alcanzables) ha producido una excepción! </string> + <string name="your_reachableaddresses_settings_caused_an_exception_">¡Su configuración ReachableAdresses (direcciones alcanzables) ha producido una excepción! </string> <string name="your_relay_settings_caused_an_exception_">¡Su configuración de repetidor de tráfico (relay) ha producido una excepción! </string> - <string name="exit_nodes">Nodos de Salida (de la red Tor) </string> + <string name="exit_nodes">Nodos de Salida</string> <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y direcciones) para el último salto </string> <string name="enter_exit_nodes">Introduzca reglas para nodos de salida </string> <string name="exclude_nodes">Excluír Nodos (evitarlos en la red Tor)</string>

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 04 Nov '12

04 Nov '12

commit 7272116451829b2065a1b28608a6bc347bf7b11f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 19:15:11 2012 +0000 Update translations for orbot_completed --- values-es/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 4846faa..ca6bc9a 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -124,19 +124,19 @@ <string name="button_grant_superuser">Solicitar Permisos de Superusuario </string> <string name="pref_select_apps">Seleccionar Aplicaciones </string> <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor </string> - <string name="pref_node_configuration">Configuración de Nodos</string> - <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string> + <string name="pref_node_configuration">Configuración de Nodos </string> + <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos. </string> <string name="pref_entrance_node">Nodos de Entrada (a la red Tor) </string> <string name="pref_entrance_node_summary">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y rangos de direcciones) para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca reglas para nodos de entrada </string>  <string name="pref_proxy_title">Proxy al Exterior (outbound) en la Red </string> - <string name="pref_proxy_type_title">Tipo de Proxy Saliente </string> - <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente (a internet, no a Tor): HTTP, HTTPS, SOCKS4, SOCKS5 </string> + <string name="pref_proxy_type_title">Tipo de Proxy Saliente (a internet, no a Tor) </string> + <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, SOCKS4, SOCKS5 </string> <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string> - <string name="pref_proxy_host_title">Servidor Proxy Saliente</string> - <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente (a internet, no a Tor) </string> + <string name="pref_proxy_host_title">Servidor Proxy Saliente (a internet, no a Tor) </string> + <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente </string> <string name="pref_proxy_host_dialog">Introduzca la dirección del proxy </string> <string name="pref_proxy_port_title">Puerto del Proxy Saliente </string> <string name="pref_proxy_port_summary">Puerto del servidor proxy saliente (a internet, no a Tor) </string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Nov '12

04 Nov '12

commit 9f2d1b494103b32137b9d677069b87c5f18e203e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 19:15:08 2012 +0000 Update translations for orbot --- values-es/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index 4846faa..ca6bc9a 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -124,19 +124,19 @@ <string name="button_grant_superuser">Solicitar Permisos de Superusuario </string> <string name="pref_select_apps">Seleccionar Aplicaciones </string> <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor </string> - <string name="pref_node_configuration">Configuración de Nodos</string> - <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string> + <string name="pref_node_configuration">Configuración de Nodos </string> + <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos. </string> <string name="pref_entrance_node">Nodos de Entrada (a la red Tor) </string> <string name="pref_entrance_node_summary">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y rangos de direcciones) para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca reglas para nodos de entrada </string>  <string name="pref_proxy_title">Proxy al Exterior (outbound) en la Red </string> - <string name="pref_proxy_type_title">Tipo de Proxy Saliente </string> - <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente (a internet, no a Tor): HTTP, HTTPS, SOCKS4, SOCKS5 </string> + <string name="pref_proxy_type_title">Tipo de Proxy Saliente (a internet, no a Tor) </string> + <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, SOCKS4, SOCKS5 </string> <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string> - <string name="pref_proxy_host_title">Servidor Proxy Saliente</string> - <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente (a internet, no a Tor) </string> + <string name="pref_proxy_host_title">Servidor Proxy Saliente (a internet, no a Tor) </string> + <string name="pref_proxy_host_summary">Nombre del servidor proxy saliente </string> <string name="pref_proxy_host_dialog">Introduzca la dirección del proxy </string> <string name="pref_proxy_port_title">Puerto del Proxy Saliente </string> <string name="pref_proxy_port_summary">Puerto del servidor proxy saliente (a internet, no a Tor) </string>

1 0

[stem/master] stem.process integ test with RUN_SOCKET target broken
by atagar＠torproject.org 04 Nov '12

04 Nov '12

commit c58514337ec02d17260c9468ba17b1a15f959c82 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 4 11:04:42 2012 -0800 stem.process integ test with RUN_SOCKET target broken Ok, this puzzled me for a while. Our stem.process integ tests make '/tmp/stem_integ' to be its temporary data directory for the run, then cleans it up afterward. This is great, except that the RUN_SOCKET causes us to run with the following in its torrc... ControlSocket /tmp/stem_integ/socket It's a coincidence that both use the same tmp directory, but it's not necessarily bad. What was bad, though, is that... * the stem.process tests broke since the mkdir call for stem_integ failed * if that hadn't failed our tearDown would have deleted stem_integ, and with it our control socket causing all further tests to fail We should probably use the tempfile module to make our stem.process data directory, but for now just being lazy and having it account for the RUN_SOCKET target. Caught by Ravi on... https://trac.torproject.org/7284 --- test/integ/process.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index 127eb40..fc2825a 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -18,11 +18,9 @@ DATA_DIRECTORY = '/tmp/stem_integ' class TestProcess(unittest.TestCase): def setUp(self): - os.makedirs(DATA_DIRECTORY) + if not os.path.exists(DATA_DIRECTORY): + os.makedirs(DATA_DIRECTORY) - def tearDown(self): - shutil.rmtree(DATA_DIRECTORY, ignore_errors = True) - def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config.

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 04 Nov '12

04 Nov '12

commit 6e0c853bac22ab4f2cc00496a58d2167f8aa6464 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 18:45:13 2012 +0000 Update translations for orbot_completed --- values-es/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index d07dc68..4846faa 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -125,7 +125,7 @@ <string name="pref_select_apps">Seleccionar Aplicaciones </string> <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor </string> <string name="pref_node_configuration">Configuración de Nodos</string> - <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan sus circuitos.</string> + <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string> <string name="pref_entrance_node">Nodos de Entrada (a la red Tor) </string> <string name="pref_entrance_node_summary">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y rangos de direcciones) para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca reglas para nodos de entrada </string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 04 Nov '12

04 Nov '12

commit eb8a1610391b7cfc89a5dcd8c5e7ed2e4cf0b41d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 4 18:45:08 2012 +0000 Update translations for orbot --- values-es/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-es/strings.xml b/values-es/strings.xml index d07dc68..4846faa 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -125,7 +125,7 @@ <string name="pref_select_apps">Seleccionar Aplicaciones </string> <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor </string> <string name="pref_node_configuration">Configuración de Nodos</string> - <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan sus circuitos.</string> + <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a las rutas del tráfico propio que envíe a través de Tor, si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string> <string name="pref_entrance_node">Nodos de Entrada (a la red Tor) </string> <string name="pref_entrance_node_summary">Reglas de identificación de nodos (fingerprints (huellas digitales), nicks (alias), códigos de país y rangos de direcciones) para el primer salto. Prevalecen las configuraciones de exclusión de nodos y las de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca reglas para nodos de entrada </string>

1 0

[ooni-probe/master] * Renaming TestCase to NetTestCase to avoid namespace confusion.
by isis＠torproject.org 04 Nov '12

04 Nov '12

commit a102a8309dbe287e5d20d3c605d7a2b3743f5da0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Nov 4 04:09:00 2012 +0000 * Renaming TestCase to NetTestCase to avoid namespace confusion. --- ooni/runner.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index cf3a7ee..a7973dc 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -18,7 +18,7 @@ from twisted.trial.runner import isTestCase from twisted.trial.runner import filenameToModule from ooni.inputunit import InputUnitFactory -from ooni.nettest import InputTestSuite, TestCase +from ooni.nettest import InputTestSuite, NetTestCase from ooni.plugoo import tests as oonitests from ooni.reporter import ReporterFactory from ooni.utils import log, date @@ -121,7 +121,7 @@ def processTestOptions(cls, config): :class:`ooni.nettest.Nettest`. :param cls: - An subclass of :class:`ooni.nettest.TestCase`. + An subclass of :class:`ooni.nettest.NetTestCase`. :param config: A configured and instantiated :class:`twisted.python.usage.Options` class. @@ -201,7 +201,7 @@ def loadTestsAndOptions(classes, config): options.append([]) log.err(ae) - elif issubclass(klass, TestCase): + elif issubclass(klass, NetTestCase): try: cases, opts = processNetTest(klass, config, method_prefix) except Exception, e:

1 0

[ooni-probe/master] * Added constructor override to call setUpClass, for handling inputs.
by isis＠torproject.org 04 Nov '12

04 Nov '12

commit e526c0f715d00dfe0f0135081436b36e24f5d4f5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Nov 4 04:27:12 2012 +0000 * Added constructor override to call setUpClass, for handling inputs. --- ooni/nettest.py | 120 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 62 insertions(+), 58 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index e01c4f1..8cd3c07 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -11,6 +11,7 @@ # # <------------------- +from functools import partial import sys import os import itertools @@ -64,11 +65,60 @@ class InputTestSuite(pyunit.TestSuite): self._idx += 1 return result - class NetTestAdaptor(unittest.TestCase): """ XXX fill me in """ + + @classmethod + def __new__(cls, *args, **kwargs): + super( NetTestAdaptor, cls ).__new__(*args, **kwargs) + if hasattr(cls, setUpClass): + setUpClass(cls) + else: + log.debug("NetTestAdaptor: constructor could not find setUpClass") + + def __init__(self, *args, **kwargs): + """ + If you override me, you must call + + ``super(NetTestCase, self).__init__(*args, **kwargs)`` + + at the beginning of your __init__ method. Keyword arguments passed to + the above statement become attributes of the adaptor, and can be used + to alter the logic of input handling and parent class instantiation. + Therefore, You probably do not need to pass me any keyword arguments + when calling me, i.e. using ``(*args, **kwargs)`` will work just fine. + """ + log.debug("NetTestAdaptor: created") + if kwargs: + if 'methodName' in kwargs: + log.debug("NetTestAdaptor: found 'methodName' in kwargs") + log.debug("NetTestAdaptor: calling unittest.TestCase.__init()") + super( NetTestAdaptor, self ).__init__( + methodName=kwargs['methodName'] ) + else: + log.debug("NetTestAdaptor: calling unittest.TestCase.__init()") + super( NetTestAdaptor, self ).__init__( ) + + for key, value in kwargs.items(): ## Let subclasses define their + if key != 'methodName': ## instantiation without + if not hasattr(self, key): ## overriding parent classes + log.debug("NetTestAdaptor: calling setattr(self,%s,%s)" + % (key, value) ) + setattr(self, key, value) + + #setattr(self, "copyattr", __copy_attr__) + + ## Internal attribute copies: + #self._input_parser = copyattr("inputParser", alt=__input_parser__) + #self._nettest_name = copyattr("name", alt="NetTestAdaptor")) + + if self.parsed_inputs: + self.inputs = self.parsed_inputs + else: + log.debug("Unable to find parsed inputs") + @staticmethod def __copyattr__(obj, old, new=None, alt=None): """ @@ -125,63 +175,17 @@ class NetTestAdaptor(unittest.TestCase): _copy = alt setattr(obj, new, _copy) - ## Using setattr in __init__ for now: - #def copyattr(self, *args, **kwargs): - # if len(args) >= 1: - # _copy = partial(__copyattr__, args[0]) - # if len(args) == 2: - # return _copy(new=args[1]) - # elif len(args) == 3: - # return _copy(new=args[1], alt=args[2]) - # elif kwargs: - # return _copy(kwargs) - # else: - # return - - def __init__(self, *args, **kwargs): - """ - If you override me, you must call - - ``super(NetTestCase, self).__init__(*args, **kwargs)`` - - at the beginning of your __init__ method. Keyword arguments passed to - the above statement become attributes of the adaptor, and can be used - to alter the logic of input handling and parent class instantiation. - Therefore, You probably do not need to pass me any keyword arguments - when calling me, i.e. using ``(*args, **kwargs)`` will work just fine. - """ - log.debug("NetTestAdapter: created") - if kwargs: - if 'methodName' in kwargs: - log.debug("NetTestAdaptor: found 'methodName' in kwargs") - log.debug("NetTestAdaptor: calling unittest.TestCase.__init()") - super( NetTestAdaptor, self ).__init__( - methodName=kwargs['methodName'] ) - else: - log.debug("NetTestAdaptor: calling unittest.TestCase.__init()") - super( NetTestAdaptor, self ).__init__( ) - - for key, value in kwargs.items(): ## Let subclasses define their - if key != 'methodName': ## instantiation without - if not hasattr(self, key): ## overriding parent classes - log.debug("NetTestAdaptor: calling setattr(self,%s,%s)" - % (key, value) ) - setattr(self, key, value) - - #setattr(self, "copyattr", __copy_attr__) - - ## Internal attribute copies: - #self._input_parser = copyattr("inputParser", alt=__input_parser__) - #self._nettest_name = copyattr("name", alt="NetTestAdaptor")) - - ## Set our inputs to the parsed and processed inputs: - #self.inputs = __get_inputs__() - - ## xxx do we need: - if self.parsed_inputs: - self.inputs = self.parsed_inputs - else: - log.debug("Unable to find parsed inputs") + def copyattr(self, *args, **kwargs): + if len(args) >= 1: + _copy = partial(__copyattr__, args[0]) + if len(args) == 2: + return _copy(new=args[1]) + elif len(args) == 3: + return _copy(new=args[1], alt=args[2]) + elif kwargs: + return _copy(kwargs) + else: + return @staticmethod def __input_parser__(one_input): return one_input

1 0

[ooni-probe/master] * Started creating the Options constructor.
by isis＠torproject.org 04 Nov '12

04 Nov '12

commit cf764e5c195fefc70d215b73490ecffc303bec6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Nov 4 05:16:45 2012 +0000 * Started creating the Options constructor. --- ooni/nettest.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index f8f3e30..4010199 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -72,11 +72,11 @@ class NetTestAdaptor(unittest.TestCase): @classmethod def __new__(cls, *args, **kwargs): - super( NetTestAdaptor, cls ).__new__(*args, **kwargs) if hasattr(cls, "setUpClass"): - super( NetTestAdaptor, cls ).setUpClass() + super( NetTestAdaptor, cls ).setUpClass(cls) else: log.debug("NetTestAdaptor: constructor could not find setUpClass") + return super( NetTestAdaptor, cls ).__new__(cls, *args, **kwargs) def __init__(self, *args, **kwargs): """ @@ -253,6 +253,9 @@ class NetTestAdaptor(unittest.TestCase): def __optstruct__(cls): + def buildUsageOptions(self, *args, **kwargs): + pass + @classmethod def setUpClass(cls): """ @@ -271,8 +274,10 @@ class NetTestAdaptor(unittest.TestCase): cls.parsed_inputs = __get_inputs__(cls) ## XXX we should handle options generation here - cls._opt_param = __copyattr__(cls, "optParameters") - cls._opt_su + cls._opt_parameters = __copyattr__(cls, "optParameters") + cls._opt_flags = __copyattr__(cls, "optFlags") + cls._sub_commands = __copyattr__(cls, "subCommands") + cls._sub_options = __copyattr__(cls, "subOptions") class NetTestCase(NetTestAdaptor):

1 0

[ooni-probe/master] * Working on the t.p.usage.Options constructor class.
by isis＠torproject.org 04 Nov '12

04 Nov '12

commit faa7c9e9030c62e0baace854aa440b4fed3f0a5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Nov 4 06:04:59 2012 +0000 * Working on the t.p.usage.Options constructor class. --- ooni/nettest.py | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 2ba8ccb..7f9f72c 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -251,7 +251,18 @@ class NetTestAdaptor(unittest.TestCase): @classmethod def __optstruct__(cls): + """ + Constuctor for a custom t.p.usage.Options class, per NetTestCase. + """ + #if cls._opt_parameters is None: + # cls._opt_parameters = [ list() ] + class NetTestOptions(usage.Options): + """Per NetTestCase Options class.""" + optParameters = cls._testopt_params + optFlags = cls._testopt_flags + subOptions = cls._sub_options + subCommands = cls._sub_command def buildUsageOptions(self, *args, **kwargs): pass @@ -267,17 +278,23 @@ class NetTestAdaptor(unittest.TestCase): subclass of :class:`ooni.nettest.NetTestCase`, so that the calling functions during NetTestCase class setup can handle them correctly. """ + ## These internal inputs are for handling inputs and inputFile cls._raw_inputs = __copyattr__(cls, "inputs") cls._input_file = __copyattr__(cls, "inputFile") cls._input_parser = __copyattr__(cls, "inputParser", alt=__input_parser__) cls._nettest_name = __copyattr__(cls, "name", alt="NetTestAdaptor") + + ## This creates a class attribute with all of the parsed inputs, + ## which the instance will later set to be `self.inputs`. cls.parsed_inputs = __get_inputs__(cls) ## XXX we should handle options generation here - cls._opt_parameters = __copyattr__(cls, "optParameters") - cls._opt_flags = __copyattr__(cls, "optFlags") - cls._sub_commands = __copyattr__(cls, "subCommands") - cls._sub_options = __copyattr__(cls, "subOptions") + cls._testopt_params = __copyattr__(cls, "optParameters") + cls._testopt_flags = __copyattr__(cls, "optFlags") + cls._sub_options = __copyattr__(cls, "subOptions") + cls._sub_command = __copyattr__(cls, "subCommand") + cls._default_subcmd = __copyattr__(cls, "defaultSubCommand") + cls._nettest_version = __copyattr__(cls, "version") class NetTestCase(NetTestAdaptor):

1 0