June 2014 - tor-commits - lists.torproject.org

[metrics-db/master] Update to latest metrics-lib.
by karsten＠torproject.org 16 Jun '14

16 Jun '14

commit f5734ebfed42a9ff0807be63a156c794746725ec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 16 09:10:40 2014 +0200 Update to latest metrics-lib. --- deps/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/metrics-lib b/deps/metrics-lib index 38c48dd..2351cea 160000 --- a/deps/metrics-lib +++ b/deps/metrics-lib @@ -1 +1 @@ -Subproject commit 38c48ddd0c49978bbfa5e0a987cfd3a890692a5c +Subproject commit 2351cead7a693c53f3ec8329e84ca15add55c945

1 0

[metrics-lib/master] Accept [SP|TAB]+ as delimiter in two places.
by karsten＠torproject.org 16 Jun '14

16 Jun '14

commit 2351cead7a693c53f3ec8329e84ca15add55c945 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jun 16 07:32:55 2014 +0200 Accept [SP|TAB]+ as delimiter in two places. There have been at least two relays including an additional SP after their nickname in server and extra-info descriptors. The spec stays vague about whether this is allowed or not, but the directory authorities seem to accept these descriptors just fine. We should also accept these descriptors. We should probably accept [SP|TAB]+ in more places. But right now we're losing data by discarding these descriptors. Let's do the quick fix now and the potentially cleaner fix later. Fixes #12403. --- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 13 +++++++++++-- .../torproject/descriptor/impl/ServerDescriptorImpl.java | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index a533113..5951da0 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -201,8 +201,17 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl private void parseExtraInfoLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (partsNoOpt.length != 3) { - throw new DescriptorParseException("Illegal line '" + line - + "' in extra-info descriptor."); + /* Also accept [SP|TAB]+ where we'd previously only accept SP as + * delimiter. This is a hotfix for #12403, because we're currently + * not storing valid descriptors. A better place to implement this + * would probably be in DescriptorImpl. */ + partsNoOpt = line.startsWith("opt ") ? + line.substring("opt ".length()).split("[ \t]+") : + line.split("[ \t]+"); + if (partsNoOpt.length != 3) { + throw new DescriptorParseException("Illegal line '" + line + + "' in extra-info descriptor."); + } } this.nickname = ParseHelper.parseNickname(line, partsNoOpt[1]); this.fingerprint = ParseHelper.parseTwentyByteHexString(line, diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 52d49b0..69ffcd8 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -170,8 +170,17 @@ public class ServerDescriptorImpl extends DescriptorImpl private void parseRouterLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (partsNoOpt.length != 6) { - throw new DescriptorParseException("Illegal line '" + line - + "' in server descriptor."); + /* Also accept [SP|TAB]+ where we'd previously only accept SP as + * delimiter. This is a hotfix for #12403, because we're currently + * not storing valid descriptors. A better place to implement this + * would probably be in DescriptorImpl. */ + partsNoOpt = line.startsWith("opt ") ? + line.substring("opt ".length()).split("[ \t]+") : + line.split("[ \t]+"); + if (partsNoOpt.length != 6) { + throw new DescriptorParseException("Illegal line '" + line + + "' in server descriptor."); + } } this.nickname = ParseHelper.parseNickname(line, partsNoOpt[1]); this.address = ParseHelper.parseIpv4Address(line, partsNoOpt[2]);

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 16 Jun '14

16 Jun '14

commit 57ddd097cf26fcbdf557e3fca5c5930fbac7c779 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 16 01:45:03 2014 +0000 Update translations for bridgedb --- pt/LC_MESSAGES/bridgedb.po | 133 ++++++++++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 54 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index 381e20c..9651193 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -5,14 +5,15 @@ # Translators: # André Monteiro <andre.monteir(a)gmail.com>, 2014 # kagazz <lourenxo_619(a)hotmail.com>, 2014 +# Andrew_Melim <nokostya.translation(a)gmail.com>, 2014 # TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-21 11:02+0000\n" -"Last-Translator: André Monteiro <andre.monteir(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-16 01:40+0000\n" +"Last-Translator: Andrew_Melim <nokostya.translation(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,19 +24,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "Pedimos desculpa, mas ocorreu algo errado com o seu pedido!" @@ -59,39 +57,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMANDOS: (combine COMANDOS para especificar múltiplas opções simultaneamente)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Bem-vindo ao BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "transport TYPEs suportados:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Olá, %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Olá, amigo!" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "Chaves Públicas" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "Este email foi gerado com arco-íris, unicórnios e estrelas\npara %s no %s em %s." -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -101,14 +104,20 @@ msgid "" "\n" msgstr "A BridgeDB pode fornecer bridges com vários %stypes de Transportes Conectáveis%s,\nos quais poderão ajudar a ocultar as suas ligações à rede Tor, tornando mais difícil para qualquer um filtrar o seu tráfego de internet para determinar se está a usar o Tor.\n\n" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -117,20 +126,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "O que são 'bridges'?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Preciso de uma alternativa para aceder a bridges!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -138,75 +147,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "As minhas bridges não funcionam! Preciso de ajuda!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Se o seu Tor não funciona, deve enviar email para %s." -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "Aqui estão as suas linhas bridge:" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "Obter o Bridges!" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "Por favor selecione as opções para o tipo de bridge:" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "Necessita de endereços IPv6?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "Necessita de %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "O seu navegador não está a mostrar as imagens apropriadamente." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "Introduza os caracteres da imagem acima..." -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "O seu fornecedor de serviço internet (ISP) bloqueia ou censura conexões\n à rede Tor ?" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -214,30 +231,35 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" -msgstr "" +msgstr "Reportar um erro" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" @@ -251,15 +273,19 @@ msgstr "" msgid "Contact" msgstr "" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -300,28 +326,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "Não" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "Nada" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -329,7 +354,7 @@ msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0

[arm/master] Taking advantage of Stem's @uses_settings
by atagar＠torproject.org 16 Jun '14

16 Jun '14

commit fe89d773374fb35f01d4d32afa47e757c8c4203c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 15 18:05:17 2014 -0700 Taking advantage of Stem's @uses_settings Dropping our load_settings() helper function in favor of Stem's @uses_settings annotation. Once correction this makes is that if we fail to load our interal settings we printed an error using msg(). We can't - msg() *uses* our internal settings after all. :P --- arm/config/strings.cfg | 1 - arm/starter.py | 9 ++------- arm/util/__init__.py | 35 ++++++++++++++--------------------- run_tests.py | 33 +++++++++++++++++++++------------ 4 files changed, 37 insertions(+), 41 deletions(-) diff --git a/arm/config/strings.cfg b/arm/config/strings.cfg index 3ac3b3c..25970d0 100644 --- a/arm/config/strings.cfg +++ b/arm/config/strings.cfg @@ -13,7 +13,6 @@ msg.wrap {text} -msg.config.unable_to_load_settings Unable to load arm's internal configurations: {error} msg.config.unable_to_read_file Failed to load configuration (using defaults): "{error}" msg.config.nothing_loaded No armrc loaded, using defaults. You can customize arm by placing a configuration file at {path} (see the armrc.sample for its options). diff --git a/arm/starter.py b/arm/starter.py index ba7c9af..8d27024 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -27,21 +27,16 @@ import stem.util.conf import stem.util.log import stem.util.system -from arm.util import BASE_DIR, init_controller, msg, trace, info, notice, warn, load_settings +from arm.util import BASE_DIR, init_controller, msg, trace, info, notice, warn, uses_settings CONFIG = stem.util.conf.get_config('arm') +@uses_settings def main(): CONFIG.set('start_time', str(int(time.time()))) try: - load_settings() - except IOError as exc: - print msg('config.unable_to_load_settings', error = exc) - sys.exit(1) - - try: args = arm.arguments.parse(sys.argv[1:]) CONFIG.set('startup.events', args.logged_events) except ValueError as exc: diff --git a/arm/util/__init__.py b/arm/util/__init__.py index d606a43..3d3f725 100644 --- a/arm/util/__init__.py +++ b/arm/util/__init__.py @@ -4,9 +4,16 @@ application's status, making cross platform system calls, parsing tor data, and safely working with curses (hiding some of the gory details). """ -__all__ = ["connections", "panel", "sysTools", "text_input", "tor_config", "tor_tools", "tracker", "ui_tools"] +__all__ = [ + 'panel', + 'text_input', + 'tor_config', + 'tracker', + 'ui_tools', +] import os +import sys import stem import stem.connection @@ -17,6 +24,12 @@ import stem.util.log TOR_CONTROLLER = None BASE_DIR = os.path.sep.join(__file__.split(os.path.sep)[:-2]) +try: + uses_settings = stem.util.conf.uses_settings('arm', os.path.join(BASE_DIR, 'config'), lazy_load = False) +except IOError as exc: + print "Unable to load arm's internal configurations: {error}".format(error = exc) + sys.exit(1) + def tor_controller(): """ @@ -82,26 +95,6 @@ def error(msg, **attr): _log(stem.util.log.ERROR, msg, **attr) -def load_settings(): - """ - Loads arms internal settings. This should be treated as a fatal failure if - unsuccessful. - - :raises: **IOError** if we're unable to read or parse our internal - configurations - """ - - config = stem.util.conf.get_config('arm') - - if not config.get('settings_loaded', False): - config_dir = os.path.join(BASE_DIR, 'config') - - for config_file in os.listdir(config_dir): - config.load(os.path.join(config_dir, config_file)) - - config.set('settings_loaded', 'true') - - def _log(runlevel, message, **attr): """ Logs the given message, formatted with optional attributes. diff --git a/run_tests.py b/run_tests.py index 31e82fb..63de9be 100755 --- a/run_tests.py +++ b/run_tests.py @@ -13,7 +13,7 @@ import unittest import stem.util.conf import stem.util.test_tools -from arm.util import load_settings +from arm.util import uses_settings ARM_BASE = os.path.dirname(__file__) @@ -25,16 +25,15 @@ SRC_PATHS = [os.path.join(ARM_BASE, path) for path in ( )] +@uses_settings def main(): - load_settings() - - test_config = stem.util.conf.get_config("test") - test_config.load(os.path.join(ARM_BASE, "test", "settings.cfg")) + test_config = stem.util.conf.get_config('test') + test_config.load(os.path.join(ARM_BASE, 'test', 'settings.cfg')) orphaned_pyc = stem.util.test_tools.clean_orphaned_pyc(ARM_BASE) for path in orphaned_pyc: - print "Deleted orphaned pyc file: %s" % path + print 'Deleted orphaned pyc file: %s' % path tests = unittest.defaultTestLoader.discover('test', pattern='*.py') test_runner = unittest.TextTestRunner() @@ -45,24 +44,34 @@ def main(): static_check_issues = {} if stem.util.test_tools.is_pyflakes_available(): - for path, issues in stem.util.test_tools.get_pyflakes_issues(SRC_PATHS).items(): + pyflakes_issues = stem.util.test_tools.get_pyflakes_issues(SRC_PATHS) + + for path, issues in pyflakes_issues.items(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) if stem.util.test_tools.is_pep8_available(): - for path, issues in stem.util.test_tools.get_stylistic_issues(SRC_PATHS, check_two_space_indents = True, check_newlines = True, check_trailing_whitespace = True, check_exception_keyword = True).items(): + pep8_issues = stem.util.test_tools.get_stylistic_issues( + SRC_PATHS, + check_two_space_indents = True, + check_newlines = True, + check_trailing_whitespace = True, + check_exception_keyword = True, + ) + + for path, issues in pep8_issues.items(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) if static_check_issues: - print "STATIC CHECKS" + print 'STATIC CHECKS' for file_path in static_check_issues: - print "* %s" % file_path + print '* %s' % file_path for line_number, msg in static_check_issues[file_path]: - line_count = "%-4s" % line_number - print " line %s - %s" % (line_count, msg) + line_count = '%-4s' % line_number + print ' line %s - %s' % (line_count, msg) print

1 0

[stem/master] Supporting directories with Config's load() method
by atagar＠torproject.org 16 Jun '14

16 Jun '14

commit d2c60a8fe9a136ceaa7e502d3cbf2d7938d48f3d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 14 14:08:49 2014 -0700 Supporting directories with Config's load() method Loading all files within a directory if provided to the Config class' load() method. --- docs/change_log.rst | 4 ++++ stem/util/conf.py | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index ae0db05..2159c28 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -40,6 +40,10 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. + * **Utilities** + + * Added support for directories to :func:`stem.util.conf.Config.load`. + * **Interpreter** * The /info command errored for relays without contact information. diff --git a/stem/util/conf.py b/stem/util/conf.py index 702c27f..57bc724 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -157,6 +157,7 @@ Here's an expanation of what happened... +- get_value - provides the value for a given key as a string """ +import os import threading from stem.util import log @@ -453,10 +454,14 @@ class Config(object): def load(self, path = None): """ Reads in the contents of the given path, adding its configuration values - to our current contents. + to our current contents. If the path is a directory then this loads each + of the files, recursively. - :param str path: file path to be loaded, this uses the last loaded path if - not provided + .. versionchanged:: 1.3.0 + Added support for directories. + + :param str path: file or directory path to be loaded, this uses the last + loaded path if not provided :raises: * **IOError** if we fail to read the file (it doesn't exist, insufficient @@ -469,6 +474,13 @@ class Config(object): elif not self._path: raise ValueError('Unable to load configuration: no path provided') + if os.path.isdir(self._path): + for root, dirnames, filenames in os.walk(self._path): + for filename in filenames: + self.load(os.path.join(root, filename)) + + return + with open(self._path, 'r') as config_file: read_contents = config_file.readlines()

1 0

[stem/master] Changed @uses_settings to only provide config if used
by atagar＠torproject.org 16 Jun '14

16 Jun '14

commit 380809f02e10f4f5b648707e88aa9cb31f3e7a44 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 14 14:26:26 2014 -0700 Changed @uses_settings to only provide config if used Changing our conf module's @uses_settings decorators to only provide a 'config' argument if the funcion we're decorating accepts one. This avoids stacktraces like... Traceback (most recent call last): File "./run_tests.py", line 79, in <module> main() File "/usr/lib/python2.7/stem/util/conf.py", line 282, in wrapped return func(*args, config = config, **kwargs) TypeError: main() got an unexpected keyword argument 'config' --- docs/change_log.rst | 1 + stem/util/conf.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 2159c28..6126cc9 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -43,6 +43,7 @@ The following are only available within Stem's `git repository * **Utilities** * Added support for directories to :func:`stem.util.conf.Config.load`. + * Changed :func:`stem.util.conf.uses_settings` to only provide a 'config' keyword arument if the decorated function would accept it. * **Interpreter** diff --git a/stem/util/conf.py b/stem/util/conf.py index 57bc724..18b0df4 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -157,6 +157,7 @@ Here's an expanation of what happened... +- get_value - provides the value for a given key as a string """ +import inspect import os import threading @@ -247,6 +248,10 @@ def uses_settings(handle, path, lazy_load = True): that require settings to be loaded. Functions with this annotation will be provided with the configuration as its 'config' keyword argument. + .. versionchanged:: 1.3.0 + Omits the 'config' argument if the funcion we're decorating doesn't accept + it. + :: uses_settings = stem.util.conf.uses_settings('my_app', '/path/to/settings.cfg') @@ -279,7 +284,10 @@ def uses_settings(handle, path, lazy_load = True): config.load(path) config.set('settings_loaded', 'true') - return func(*args, config = config, **kwargs) + if 'config' in inspect.getargspec(func)[0]: + return func(*args, config = config, **kwargs) + else: + return func(*args, **kwargs) return wrapped

1 0

r26838: {website} unlink vidalia from the projects list (website/trunk/projects/en)
by Roger Dingledine 15 Jun '14

15 Jun '14

Author: arma Date: 2014-06-15 20:33:55 +0000 (Sun, 15 Jun 2014) New Revision: 26838 Modified: website/trunk/projects/en/sidenav.wmi Log: unlink vidalia from the projects list Modified: website/trunk/projects/en/sidenav.wmi =================================================================== --- website/trunk/projects/en/sidenav.wmi 2014-06-14 14:00:40 UTC (rev 26837) +++ website/trunk/projects/en/sidenav.wmi 2014-06-15 20:33:55 UTC (rev 26838) @@ -27,11 +27,8 @@ 'txt' => 'Software & Services', 'subelements' => [ {'url' => 'projects/torbrowser', - 'txt' => 'Tor Browser Bundle', + 'txt' => 'Tor Browser', }, - {'url' => 'projects/vidalia', - 'txt' => 'Vidalia', - }, {'url' => 'projects/arm', 'txt' => 'Arm', },

1 0

[metrics-web/master] Remove large parts of tordir database.
by karsten＠torproject.org 15 Jun '14

15 Jun '14

commit db79e4247c473b622b1b6b0e8049e0d0aa72c0e6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 15 17:43:07 2014 +0200 Remove large parts of tordir database. Now that we don't need to serve relay-search requests anymore, we can remove large parts of the tordir database. In particular, - delete server descriptors older than 14 days, - delete bandwidth history entries older than 14 days, - delete status entries older than 14 days (and undo splitting up that table into monthly sub tables), and - only store dirreq-stats values for all countries together. --- modules/legacy/db/tordir.sql | 81 +++++++------------- .../cron/RelayDescriptorDatabaseImporter.java | 8 +- 2 files changed, 31 insertions(+), 58 deletions(-) diff --git a/modules/legacy/db/tordir.sql b/modules/legacy/db/tordir.sql index 45b9862..f52e89b 100644 --- a/modules/legacy/db/tordir.sql +++ b/modules/legacy/db/tordir.sql @@ -1,4 +1,4 @@ --- Copyright 2010 The Tor Project +-- Copyright 2010, 2014 The Tor Project -- See LICENSE for licensing information CREATE LANGUAGE plpgsql; @@ -22,6 +22,14 @@ CREATE TABLE descriptor ( CONSTRAINT descriptor_pkey PRIMARY KEY (descriptor) ); +CREATE OR REPLACE FUNCTION delete_old_descriptor() +RETURNS INTEGER AS $$ + BEGIN + DELETE FROM descriptor WHERE DATE(published) < current_date - 14; + RETURN 1; + END; +$$ LANGUAGE plpgsql; + -- Contains bandwidth histories reported by relays in extra-info -- descriptors. Each row contains the reported bandwidth in 15-minute -- intervals for each relay and date. @@ -41,6 +49,14 @@ CREATE TABLE bwhist ( CREATE INDEX bwhist_date ON bwhist (date); +CREATE OR REPLACE FUNCTION delete_old_bwhist() +RETURNS INTEGER AS $$ + BEGIN + DELETE FROM bwhist WHERE date < current_date - 14; + RETURN 1; + END; +$$ LANGUAGE plpgsql; + -- TABLE statusentry -- Contains all of the consensus entries published by the directories. -- Each statusentry references a valid descriptor. @@ -73,59 +89,14 @@ CREATE TABLE statusentry ( rawdesc BYTEA NOT NULL ); -CREATE OR REPLACE FUNCTION statusentry_insert_trigger() -RETURNS TRIGGER AS $$ - -DECLARE - tablename TEXT; - selectresult TEXT; - nextmonth TIMESTAMP WITHOUT TIME ZONE; - v_year INTEGER; - v_month INTEGER; - n_year INTEGER; - n_month INTEGER; - -BEGIN - v_year := extract(YEAR FROM NEW.validafter); - v_month := extract(MONTH FROM NEW.validafter); - tablename := 'statusentry_y' || v_year || 'm' || - TO_CHAR(NEW.validafter, 'mm'); - EXECUTE 'SELECT relname FROM pg_class WHERE relname = '''|| tablename || - '''' INTO selectresult; - IF selectresult IS NULL THEN - nextmonth := new.validafter + interval '1 month'; - n_year := extract(YEAR FROM nextmonth); - n_month := extract(MONTH FROM nextmonth); - EXECUTE 'CREATE TABLE ' || tablename || - ' ( CHECK ( validafter >= ''' || v_year || '-' || - TO_CHAR(NEW.validafter, 'mm') || '-01 00:00:00'' ' || - 'AND validafter < ''' || n_year || '-' || - TO_CHAR(nextmonth, 'mm') || - '-01 00:00:00'') ) INHERITS (statusentry)'; - EXECUTE 'ALTER TABLE ' || tablename || ' ADD CONSTRAINT ' || - tablename || '_pkey PRIMARY KEY (validafter, fingerprint)'; - EXECUTE 'CREATE INDEX ' || tablename || '_address ON ' || - tablename || ' (address)'; - EXECUTE 'CREATE INDEX ' || tablename || '_fingerprint ON ' || - tablename || ' (fingerprint)'; - EXECUTE 'CREATE INDEX ' || tablename || '_nickname ON ' || - tablename || ' (LOWER(nickname))'; - EXECUTE 'CREATE INDEX ' || tablename || '_validafter ON ' || - tablename || ' (validafter)'; - EXECUTE 'CREATE INDEX ' || tablename || '_descriptor ON ' || - tablename || ' (descriptor)'; - EXECUTE 'CREATE INDEX ' || tablename || '_validafter_date ON ' || - tablename || ' (DATE(validafter))'; - END IF; - EXECUTE 'INSERT INTO ' || tablename || ' SELECT ($1).*' USING NEW; - RETURN NULL; -END; +CREATE OR REPLACE FUNCTION delete_old_statusentry() +RETURNS INTEGER AS $$ + BEGIN + DELETE FROM statusentry WHERE DATE(validafter) < current_date - 14; + RETURN 1; + END; $$ LANGUAGE plpgsql; -CREATE TRIGGER insert_statusentry_trigger - BEFORE INSERT ON statusentry - FOR EACH ROW EXECUTE PROCEDURE statusentry_insert_trigger(); - -- TABLE consensus -- Contains all of the consensuses published by the directories. CREATE TABLE consensus ( @@ -878,6 +849,12 @@ CREATE OR REPLACE FUNCTION refresh_all() RETURNS INTEGER AS $$ PERFORM refresh_user_stats(); RAISE NOTICE '% Deleting processed dates.', timeofday(); DELETE FROM scheduled_updates WHERE id IN (SELECT id FROM updates); + RAISE NOTICE '% Deleting old descriptors.', timeofday(); + PERFORM delete_old_descriptor(); + RAISE NOTICE '% Deleting old bandwidth histories.', timeofday(); + PERFORM delete_old_bwhist(); + RAISE NOTICE '% Deleting old status entries.', timeofday(); + PERFORM delete_old_statusentry(); RAISE NOTICE '% Terminating refresh run.', timeofday(); RETURN 1; END; diff --git a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index a51092e..b5c55c8 100644 --- a/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/modules/legacy/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -968,12 +968,8 @@ public final class RelayDescriptorDatabaseImporter { if (descriptor.getDirreqV3Reqs() != null) { int allUsers = 0; Map<String, String> obs = new HashMap<String, String>(); - for (Map.Entry<String, Integer> e : - descriptor.getDirreqV3Reqs().entrySet()) { - String country = e.getKey(); - int users = e.getValue() - 4; - allUsers += users; - obs.put(country, "" + users); + for (int users : descriptor.getDirreqV3Reqs().values()) { + allUsers += users - 4; } obs.put("zy", "" + allUsers); this.addDirReqStats(descriptor.getFingerprint(),

1 0

[metrics-web/master] No need to access the database from the website anymore.
by karsten＠torproject.org 15 Jun '14

15 Jun '14

commit 224cbe72233c4b72839cbd2ff26603869bd80488 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 12 16:41:30 2014 +0200 No need to access the database from the website anymore. The relay-search servlet was the last class to access the database for web requests. --- website/etc/web.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/website/etc/web.xml b/website/etc/web.xml index a78cd28..a3149ff 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -258,13 +258,6 @@ <location>/WEB-INF/error.jsp</location> </error-page> - <resource-ref> - <description>Tor Metrics Database</description> - <res-ref-name>jdbc/tordir</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - </resource-ref> - <context-param> <param-name>rserveHost</param-name> <param-value>localhost</param-value>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit b1efa6ab59b8600516c91f22e829399ea3a6b2ea Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 17:45:05 2014 +0000 Update translations for gettor --- fi/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/gettor.po b/fi/gettor.po index e5c29be..7b85316 100644 --- a/fi/gettor.po +++ b/fi/gettor.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-06-15 17:12+0000\n" +"PO-Revision-Date: 2014-06-15 17:20+0000\n" "Last-Translator: Finland355 <ville.ehrukainen2(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n"

1 0