January 2013 - tor-commits - lists.torproject.org

[compass/master] Added another testcase to the unit tests. Improved README
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit d8462b4e97b3ea6b0449208c6bb6bc56daf5fdc8 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Tue Jan 15 16:19:49 2013 -0500 Added another testcase to the unit tests. Improved README --- testing/README | 35 ++++++++++++++++++++++++++++------- testing/app_tests.py | 9 +++++++++ testing/testdata.json | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/testing/README b/testing/README index 9457b1e..7e9c50f 100644 --- a/testing/README +++ b/testing/README @@ -1,13 +1,34 @@ +Testing +======= -These are a set of scripts designed to makes sure that any -changes I have made don't change the behavior of the original -compass.py. test.sh will run a series of command line switches -at compass.py, and save the output in a series of named test +Unit Tests +---------- +I've started writing unit tests when bugs are encountered. +The tests are written using UnitTest, and can be run as follows: + +```python +cd compass +nosetests +``` + +Most of the tests are checking against JSON output. Where +reasonably small I have inlined the expected result in the +testcases, but in certain cases I've included them as files in +the `expectations` directory. + +Regression Tests +---------------- + +These are a set of scripts designed to make sure that changes to +the command line version of `compass.py` don't result in +different output than before. They're not pretty, but they work. + +`test.sh` will run a series of command line switches +at `compass.py`, and save the output in a series of named test files. -check.py will take two test names and compare the output +`check.py` will take two test names and compare the output from those tests to see if they match. - -Note: Sometimes a test will fail even though the output is correct +*Note:* Sometimes a test will fail even though the output is correct because the sorting works differently in my revised version and elements with the same value don't always occur in the same order. diff --git a/testing/app_tests.py b/testing/app_tests.py index 6248241..28eff17 100644 --- a/testing/app_tests.py +++ b/testing/app_tests.py @@ -35,6 +35,15 @@ class TestCase(unittest.TestCase): """) self.assertItemsEqual(received,expected) + def test_select_AS1234567890(self): + received = json.loads(self.app.get("/result.json?ases=AS1234567890").data) + expected = json.loads( +""" +{"total": {"fp": "", "index": null, "as_no": "", "nick": "", "cc": "", "p_exit": 0.0, "adv_bw": 0.0, "guard": "", "link": true, "p_guard": 0.0, "p_middle": 0.0, "exit": "", "as_info": "", "cw": 0.0, "as_name": ""}, "results": [], "excluded": null} +""" + ) + self.assertItemsEqual(received,expected) + def test_select_AS_with_label(self): received = json.loads(self.app.get("/result.json?ases=AS7922").data) expected = json.loads( diff --git a/testing/testdata.json b/testing/testdata.json index 94f079e..d3a22ac 100644 --- a/testing/testdata.json +++ b/testing/testdata.json @@ -449,4 +449,36 @@ ], "contact":"r dot p dot j at wxs dot nl", "platform":"Tor 0.2.2.39 (git-bec76476efb71549) on Windows 7 Service Pack 1 [workstation]" -}]} +}, +{"nickname":"winner", +"fingerprint":"9DD3F90D641D835C4FCA7153148B156E6FD49CEE", +"or_addresses":["46.4.106.18:443"], +"dir_address":"46.4.106.18:9030", +"running":true, +"flags":["Fast","Guard","HSDir","Named","Running","Stable","V2Dir","Valid"], +"country":"de", +"latitude":51.000000, +"longitude":9.000000, +"country_name":"Germany", +"as_number":"AS3", +"as_name":"Hetzner Online AG RZ", +"consensus_weight":8750, +"host_name":"static.18.106.4.46.clients.your-server.de", +"advertised_bandwidth_fraction":0.001122543, +"consensus_weight_fraction":0.000915991, +"guard_probability":0.002748011, +"middle_probability":0.000000000, +"exit_probability":0.000000000, +"exit_policy_summary":{"reject":["1-65535"]}, +"last_restarted":"2012-10-26 22:15:33", +"bandwidth_rate":4096000, +"bandwidth_burst":9216000, +"observed_bandwidth":5059825, +"advertised_bandwidth":4096000, +"exit_policy":[ + "reject *:*" +], +"contact":"TlpCRm91bmRhdGlvbit0b3JAZ21haWwuY29t", +"platform":"Tor 0.2.3.24-rc on Linux" +} +]}

1 0

[compass/master] Merge pull request #1 from cwacek/bug_7924
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit 24aed76852f7163756486f5bb2ac8cee92bdb968 Merge: 8c2259c 7438c0e Author: Chris W <cwacek(a)gmail.com> Date: Tue Jan 15 13:17:44 2013 -0800 Merge pull request #1 from cwacek/bug_7924 Merging fixes for #7924 app.py | 46 ++-- compass.py | 20 +- testing/app_tests.py | 53 ++++ testing/expectations/README | 2 + testing/expectations/noparam.expected | 1 + testing/expectations/top5.expected | 1 + testing/testdata.json | 452 +++++++++++++++++++++++++++++++++ util.py | 11 +- 8 files changed, 557 insertions(+), 29 deletions(-)

1 0

[compass/master] Fix for #7924.
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit 7438c0e9427db072359d954fbc969407247ef7f5 Author: Chris Wacek <cwacek(a)gmail.com> Date: Tue Jan 15 16:09:30 2013 -0500 Fix for #7924. In versions below 2.7.3, shlex doesn't properly account for unicode characters. This only occurred with Apache for some reason, either because mod_wsgi uses Python_2.7.2+ or because Apache was handing it Unicode strings. This fix simply converts the string to ASCII before handing it to shlex. Since the set of valid characters for an AS parameter are 'AS1234567890[],' and should always encode to ASCII, this should be safe. --- util.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/util.py b/util.py index 5577ba9..77cb02b 100644 --- a/util.py +++ b/util.py @@ -9,7 +9,7 @@ def JSON(val): def List(val): if val: - lex = shlex.shlex(val) + lex = shlex.shlex(val.encode('ascii','ignore')) lex.whitespace += "[]," return list(lex) else:

1 0

[compass/master] Option decoders no longer barf on empty input.
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit 6da51ab542f289738540e3fe4a48cfdd8d6c629b Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Tue Jan 15 15:44:08 2013 -0500 Option decoders no longer barf on empty input. --- util.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/util.py b/util.py index 73c24db..5577ba9 100644 --- a/util.py +++ b/util.py @@ -4,13 +4,16 @@ import shlex def JSON(val): try: return json.loads(val) - except ValueError: + except (ValueError,TypeError): return [] def List(val): - lex = shlex.shlex(val) - lex.whitespace += "[]," - return list(lex) + if val: + lex = shlex.shlex(val) + lex.whitespace += "[]," + return list(lex) + else: + return [] def NullFn(val): return val

1 0

[compass/master] Added support for command line JSON output
by karsten＠torproject.org 16 Jan '13

16 Jan '13

commit 0ab355d61ad323f1927dcad7992508e8377d44f2 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Tue Jan 15 15:40:06 2013 -0500 Added support for command line JSON output --- compass.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/compass.py b/compass.py index 7987e49..1f8d171 100755 --- a/compass.py +++ b/compass.py @@ -493,6 +493,8 @@ def create_option_parser(): group.add_option("-s", "--short", action="store_const",dest='short',const=70, help="cut the length of the line output at 70 chars") + group.add_option("-j", "--json", action="store_true", + help="output in JSON rather than human-readable format") parser.add_option_group(group) return parser @@ -554,5 +556,8 @@ if '__main__' == __name__: sorted_results = stats.sort_and_reduce(results,options) - stats.print_selection(sorted_results,options) + if options.json: + print(json.dumps(sorted_results,cls=util.ResultEncoder)) + else: + stats.print_selection(sorted_results,options)

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 56b07a78df7e8b0a091234ce18192774d2fab147 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 12:46:02 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/es.po b/es/es.po index 0e21276..9ddcd35 100644 --- a/es/es.po +++ b/es/es.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2013-01-16 12:10+0000\n" +"PO-Revision-Date: 2013-01-16 12:36+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" @@ -91,18 +91,18 @@ msgstr "Instalación completa. Pulse Aceptar para cerrar este programa." msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "El Registro de Arranque Maestro (Master Boot Record) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." +msgstr "El Master Boot Record (registro de arranque maestro) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." #: ../liveusb/gui.py:624 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "Advertencia: El Registro de Arranque Maestro (Master Boot Record) de su dispositivo no concuerda con el MBR syslinux de su sistema. Si tiene problemas arrancando desde esta memoria, pruebe ejecutando liveusb-creator con la opción --reset-mbr" +msgstr "Advertencia: El Master Boot Record (registro de arranque maestro) de su dispositivo no concuerda con el MBR syslinux de su sistema. Si tiene problemas arrancando desde esta memoria, pruebe a ejecutar el liveusb-creator con la opción --reset-mbr" #: ../liveusb/gui.py:638 msgid "Unable to mount device" -msgstr "No fue posible montar el dispositivo" +msgstr "No se pudo montar el dispositivo" #: ../liveusb/gui.py:644 msgid "Warning: All data on the selected drive will be lost." @@ -120,12 +120,12 @@ msgstr "Siguiente" msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "Su dispositivo ya contiene un sistema operativo autoarrancable (LiveOS).\nSi continua, lo sobreescribirá." +msgstr "Su dispositivo ya contiene un sistema operativo autoarrancable (LiveOS).\nSi continúa, lo sobreescribirá." #: ../liveusb/gui.py:661 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Advertencia: La creación de un nuevo sistema de archivos persistente borrará el existente." +msgstr "Advertencia: La creación de un nuevo sistema de archivos persistente borrará el suyo existente." #: ../liveusb/gui.py:717 msgid "Download complete!" @@ -137,7 +137,7 @@ msgstr "Fallo de la descarga: " #: ../liveusb/gui.py:722 msgid "You can try again to resume your download" -msgstr "Puede intentar continuar con la descarga de nuevo" +msgstr "Puede intentar continuar con la descarga de nuevo donde la dejó" #: ../liveusb/gui.py:728 msgid "Select Live ISO" @@ -153,7 +153,7 @@ msgstr "No se pudo leer el archivo seleccionado. Corrija los permisos o elija ot msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "No fue posible utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (por ejemplo C:\\)" +msgstr "No se pudo utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (ej. C:\\)" #: ../liveusb/gui.py:743 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 0ebfddf505b5ea52648f4ff329ff2091e8071c68 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 12:46:00 2013 +0000 Update translations for liveusb-creator --- es/es.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/es.po b/es/es.po index 0e21276..9ddcd35 100644 --- a/es/es.po +++ b/es/es.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2013-01-16 12:10+0000\n" +"PO-Revision-Date: 2013-01-16 12:36+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" @@ -91,18 +91,18 @@ msgstr "Instalación completa. Pulse Aceptar para cerrar este programa." msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "El Registro de Arranque Maestro (Master Boot Record) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." +msgstr "El Master Boot Record (registro de arranque maestro) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." #: ../liveusb/gui.py:624 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "Advertencia: El Registro de Arranque Maestro (Master Boot Record) de su dispositivo no concuerda con el MBR syslinux de su sistema. Si tiene problemas arrancando desde esta memoria, pruebe ejecutando liveusb-creator con la opción --reset-mbr" +msgstr "Advertencia: El Master Boot Record (registro de arranque maestro) de su dispositivo no concuerda con el MBR syslinux de su sistema. Si tiene problemas arrancando desde esta memoria, pruebe a ejecutar el liveusb-creator con la opción --reset-mbr" #: ../liveusb/gui.py:638 msgid "Unable to mount device" -msgstr "No fue posible montar el dispositivo" +msgstr "No se pudo montar el dispositivo" #: ../liveusb/gui.py:644 msgid "Warning: All data on the selected drive will be lost." @@ -120,12 +120,12 @@ msgstr "Siguiente" msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten." -msgstr "Su dispositivo ya contiene un sistema operativo autoarrancable (LiveOS).\nSi continua, lo sobreescribirá." +msgstr "Su dispositivo ya contiene un sistema operativo autoarrancable (LiveOS).\nSi continúa, lo sobreescribirá." #: ../liveusb/gui.py:661 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Advertencia: La creación de un nuevo sistema de archivos persistente borrará el existente." +msgstr "Advertencia: La creación de un nuevo sistema de archivos persistente borrará el suyo existente." #: ../liveusb/gui.py:717 msgid "Download complete!" @@ -137,7 +137,7 @@ msgstr "Fallo de la descarga: " #: ../liveusb/gui.py:722 msgid "You can try again to resume your download" -msgstr "Puede intentar continuar con la descarga de nuevo" +msgstr "Puede intentar continuar con la descarga de nuevo donde la dejó" #: ../liveusb/gui.py:728 msgid "Select Live ISO" @@ -153,7 +153,7 @@ msgstr "No se pudo leer el archivo seleccionado. Corrija los permisos o elija ot msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "No fue posible utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (por ejemplo C:\\)" +msgstr "No se pudo utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (ej. C:\\)" #: ../liveusb/gui.py:743 #, python-format

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 0dc493ad839cb57cc7d2d3750aa7e692140e781a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 12:16:03 2013 +0000 Update translations for tails-persistence-setup_completed --- es/es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 73f4e92..73ad84e 100644 --- a/es/es.po +++ b/es/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-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-01-15 23:37+0000\n" +"PO-Revision-Date: 2013-01-16 11:54+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" @@ -236,7 +236,7 @@ msgstr "Las frases clave no concuerdan" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:189 msgid "Failed" -msgstr "Fallo" +msgstr "Error" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 #: ../lib/Tails/Persistence/Step/Delete.pm:84 @@ -270,7 +270,7 @@ msgstr "Asistente de persistencia - Configuración del volumen persistente" #: ../lib/Tails/Persistence/Step/Configure.pm:63 msgid "Specify the files that will be saved in the persistent volume" -msgstr "Especificar los archivos que se guardaran en el volumen persistente" +msgstr "Especificar los archivos que se guardarán en el volumen persistente" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:67

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 3f4c3d90370aee454fef1696bb071770172b6c91 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 12:16:01 2013 +0000 Update translations for tails-persistence-setup --- es/es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 73f4e92..73ad84e 100644 --- a/es/es.po +++ b/es/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-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-01-15 23:37+0000\n" +"PO-Revision-Date: 2013-01-16 11:54+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" @@ -236,7 +236,7 @@ msgstr "Las frases clave no concuerdan" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:189 msgid "Failed" -msgstr "Fallo" +msgstr "Error" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 #: ../lib/Tails/Persistence/Step/Delete.pm:84 @@ -270,7 +270,7 @@ msgstr "Asistente de persistencia - Configuración del volumen persistente" #: ../lib/Tails/Persistence/Step/Configure.pm:63 msgid "Specify the files that will be saved in the persistent volume" -msgstr "Especificar los archivos que se guardaran en el volumen persistente" +msgstr "Especificar los archivos que se guardarán en el volumen persistente" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:67

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 16 Jan '13

16 Jan '13

commit 4655f747def669e2f478e34ba48e659e5519ddb6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 16 12:15:59 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/es.po b/es/es.po index d9f160e..0e21276 100644 --- a/es/es.po +++ b/es/es.po @@ -4,13 +4,13 @@ # # Translators: # Carlos Capote <carloscapote(a)masticable.org>, 2012. -# <strelnic(a)gmail.com>, 2012. +# <strelnic(a)gmail.com>, 2012-2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-12-04 06:38+0000\n" +"PO-Revision-Date: 2013-01-16 12:10+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" @@ -27,7 +27,7 @@ msgstr "Versión desconocida: %s" #: ../liveusb/gui.py:84 #, python-format msgid "Downloading %s..." -msgstr "Descargando %s... " +msgstr "Descargando %s..." #: ../liveusb/gui.py:197 #, python-format @@ -38,7 +38,7 @@ msgstr "El dispositivo es demasiado pequeño: debe ser al menos de %s MiB." msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "Error: No se pudo establecer u obtener el UUID de su dispositivo. No fue posible continuar." +msgstr "Error: No se pudo establecer u obtener el UUID de su dispositivo. No se pudo continuar." #: ../liveusb/gui.py:276 #, python-format @@ -54,7 +54,7 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "Advertencia: Esta herramienta debe ser ejecutada como un Administrador. Para hacer esto haz clic con el botón secundario en el icono y abre las Propiedades. Bajo la pestaña Compatibilidad, marca la casilla \"Ejecutar este programa como un administrador\"." +msgstr "Advertencia: Esta herramienta debe ser ejecutada como un Administrador. Para hacer esto, haga clic con el botón secundario del ratón sobre el icono, y abra las Propiedades. Bajo la pestaña Compatibilidad, marque la casilla \"Ejecutar este programa como un administrador\"." #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive"

1 0