April 2015 - tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 10 Apr '15

10 Apr '15

commit 561d85fb15e64459bd4203e4c928f99cb9169aea Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 10 17:15:35 2015 +0000 Update translations for tor-launcher-progress --- ca/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/progress.dtd b/ca/progress.dtd index 18b34e0..cb62f1b 100644 --- a/ca/progress.dtd +++ b/ca/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Estat del Tor"> +<!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> <!ENTITY torprogress.pleaseWait "Si us plau, espereu mentre establim una connexió a la xarxa Tor.">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 Apr '15

10 Apr '15

commit ef6512b4faef81c5d4442523c0882dedc4dbdd1e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 10 17:15:03 2015 +0000 Update translations for bridgedb --- ku_IQ/LC_MESSAGES/bridgedb.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ku_IQ/LC_MESSAGES/bridgedb.po b/ku_IQ/LC_MESSAGES/bridgedb.po index 3f4feb5..d984374 100644 --- a/ku_IQ/LC_MESSAGES/bridgedb.po +++ b/ku_IQ/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Haval Abdulkarim <haval.abdulkarim(a)gmail.com>, 2015 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: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-14 08:34+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-10 17:10+0000\n" +"Last-Translator: Haval Abdulkarim <haval.abdulkarim(a)gmail.com>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/torproject/language/ku_IQ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +57,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "!BridgeDB بەخێربێیت بۆ" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -259,7 +260,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:92 msgid "Source Code" -msgstr "" +msgstr "کۆدی سەرچاوە" #: lib/bridgedb/templates/base.html:95 msgid "Changelog" @@ -271,7 +272,7 @@ msgstr "" #: lib/bridgedb/templates/bridges.html:81 msgid "Select All" -msgstr "" +msgstr "دیاریکردنی هەمووی" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" @@ -314,7 +315,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "%s1%s هەنگاوی" #: lib/bridgedb/templates/index.html:13 #, python-format @@ -352,15 +353,15 @@ msgstr "" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "هەڵبژاردە پێشکەوتووەکان" #: lib/bridgedb/templates/options.html:88 msgid "No" -msgstr "" +msgstr "نەخێر" #: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "هیچ" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 10 Apr '15

10 Apr '15

commit 4fde622ebd05b052401a73e181b1eb7a205033d9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 10 16:45:58 2015 +0000 Update translations for tor_animation --- ca.srt | 76 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/ca.srt b/ca.srt index 78c998d..e5023af 100644 --- a/ca.srt +++ b/ca.srt @@ -1,106 +1,106 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +Ens hem acostumat molt a internet. 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +Estem compartint informació constantment +sobre nosaltres i la nostra vida privada: 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +el menjar que mengem, la gent que coneixem, 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +els llocs on anem i les coses que llegim. 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +Deixa que m'expliqui millor. 6 00:00:14,920 --> 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +En aquest precís moment, +si algú intenta localitzar-vos, 7 00:00:18,060 --> 00:00:22,480 -they'll see your real identity, -precise location, operating system, +veurà la vostra identitat real, +la localització precisa, el sistema operatiu, 8 00:00:22,800 --> 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +tots els llocs web que heu visitat, +el navegador que useu per navegar per internet, 9 00:00:26,700 --> 00:00:29,140 -and so much more information -about you and your life +i molta més informació +sobre vosaltres i la vostra vida. 10 00:00:29,620 --> 00:00:32,460 -which you probably didn't mean -to share with unknown strangers, +la qual probablement no teníeu intenció +de compartir amb desconeguts, 11 00:00:32,920 --> 00:00:35,840 -who could easily use this data -to exploit you. +que podrien fer servir fàcilment aquesta informació +per abusar de vosaltres. 12 00:00:36,220 --> 00:00:38,120 -But not if you're using Tor! +Però això no passa si esteu fent servir Tor! 13 00:00:39,140 --> 00:00:42,840 -Tor Browser protects our privacy -and identity on the Internet. +El navegador Tor protegeix la nostra privadesa +i la nostra identitat a Internet. 14 00:00:43,560 --> 00:00:46,760 -Tor secures your connection -with three layers of encryption +Tor assegura la teva connexió +amb tres capes d'encriptatge. 15 00:00:46,940 --> 00:00:51,760 -and passes it through three voluntarily -operated servers around the world, +i la passa per tres servidors duts a terme +voluntàriament a tot el món, 16 00:00:52,280 --> 00:00:55,520 -which enables us to communicate -anonymously over the Internet. +que ens permeten comunicar-nos +de manera anònima per Internet. 17 00:00:58,560 --> 00:01:00,280 -Tor also protects our data +Tor també protegeix la nostra informació 18 00:01:00,400 --> 00:01:03,900 -against corporate or government targeted -and mass surveillance. +dels objectius del govern o les grans empreses +i la vigilància massiva. 19 00:01:04,880 --> 00:01:09,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +Potser viviu en un país repressiu +que intenta controlar i vigilar Internet. 20 00:01:09,900 --> 00:01:13,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +O potser no voleu que les grans empreses +s'aprofitin de la vostra informació personal. 21 00:01:14,880 --> 00:01:17,640 -Tor makes all of its users -to look the same +Tot fa que tots els seus usuaris +siguin iguals 22 00:01:17,920 --> 00:01:20,800 -which confuses the observer -and makes you anonymous. +cosa que confon l'observador +i us fa anònims. 23 00:01:21,500 --> 00:01:24,980

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Apr '15

10 Apr '15

commit 6d27d47a31df12f3905e5b93552678eaaedaf6a4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 10 16:45:48 2015 +0000 Update translations for torbutton-torbuttondtd --- ca/torbutton.dtd | 32 ++++++++++++++++---------------- sv/torbutton.dtd | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd index 83f2b1a..57cff78 100644 --- a/ca/torbutton.dtd +++ b/ca/torbutton.dtd @@ -162,26 +162,26 @@ <!ENTITY torbutton.prefs.sec_html5_tooltip "En alguns llocs haureu de fer servir el botó NoScript de la barra d'eines per activar aquests objectes audiovisuals."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Algunes optimitzacions de realització del JavaScript estan desactivades. "> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Inferència de Tipus, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Punt de referència JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Els Scripts d'alguns llocs poden funcionar més lentament. "> <!ENTITY torbutton.prefs.sec_jar_desc "Els fitxers remots JAR estan bloquejats. "> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Els fitxers JAR són molt rars a la web, però poden ser una fon de XSS i altres atacs. "> +<!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismes que mostren equacions matemàtiques estan desactivats."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "El MathML està desactivat. "> <!ENTITY torbutton.prefs.sec_med_high "Mitjà-alt"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Totes les optimitzacions de realització de JavaScripts estan desactivaces. "> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Algunes característiques de renderització de tipus de lletra estan desactivades."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "El mecanisme de renderització de tipus de lletre Graphite està desactivat. "> +<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipus d'imatge estan desactivats. "> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les imatges SVG estan desactivades. "> +<!ENTITY torbutton.prefs.sec_js_https_desc "El JavaScript està desactivat per defecte en tots els llocs no-HTTPS"> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "El JavaScript pot ser activat lloc per lloc mitjançant el botó NoScript de la barra d'eines. "> <!ENTITY torbutton.prefs.sec_high "Alt"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_all_js_desc "El JavaScript està desactivat per defecte a tots els llocs."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "La majoria de formats d'audio i video estan desactivats. "> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "El WebM és l'únic còdec que romàn activat. "> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipus de lletra i icones poden mostrar-se incorrectament. "> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Els fitxers de tipus de lletra provinents de llocs web estan bloquejats. "> <!ENTITY torbutton.prefs.sec_custom "Valors personalitzats"> <!ENTITY torbutton.circuit_display.title "Circuit de tor per a aquest lloc"> diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd index d4de340..5180cd8 100644 --- a/sv/torbutton.dtd +++ b/sv/torbutton.dtd @@ -167,13 +167,13 @@ <!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML är inaktiverat."> <!ENTITY torbutton.prefs.sec_med_high "Medium-hög"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Alla prestandaoptimeringar av JavaScript är inaktiverade."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc "Vissa typer av bilder är inaktiverade."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder är inaktiverade."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "Hög">

1 0

[stem/master] When reporting static issues reporting the line's content
by atagar＠torproject.org 10 Apr '15

10 Apr '15

commit d14c2803eca669022a64a5caf16699ce77e2fb70 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 10 08:50:49 2015 -0700 When reporting static issues reporting the line's content For example, rather than... * /home/atagar/Desktop/stem/stem/descriptor/server_descriptor.py line 125 - uses single rather than double quotes line 180 - uses single rather than double quotes line 206 - uses single rather than double quotes line 226 - uses single rather than double quotes line 269 - uses single rather than double quotes ... we now show... * /home/atagar/Desktop/stem/stem/descriptor/server_descriptor.py line 125 - uses single rather than double quotes # @source "145.53.65.130" line 180 - uses single rather than double quotes # "router" nickname address ORPort SocksPort DirPort line 206 - uses single rather than double quotes # "bandwidth" bandwidth-avg bandwidth-burst bandwidth-observed line 226 - uses single rather than double quotes # "platform" string line 269 - uses single rather than double quotes # "hibernating" 0|1 (in practice only set if one) --- docs/change_log.rst | 1 + run_tests.py | 8 ++++---- stem/util/test_tools.py | 39 +++++++++++++++++++++++++++++---------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 6a6c23c..4c96528 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -70,6 +70,7 @@ conversion (:trac:`14075`). * Windows support for connection resolution (:trac:`14844`) * :func:`stem.util.connection.port_usage` always returned None (:trac:`14046`) + * :func:`~stem.util.test_tools.stylistic_issues` and :func:`~stem.util.test_tools.pyflakes_issues` now provide namedtuples that also includes the line * Added :func:`stem.util.system.tail` * Proc connection resolution could fail on especially busy systems (:trac:`14048`) diff --git a/run_tests.py b/run_tests.py index 824b16c..0407ece 100755 --- a/run_tests.py +++ b/run_tests.py @@ -320,13 +320,13 @@ def _print_static_issues(static_check_issues): line_to_issues = {} - for line_number, msg in static_check_issues[file_path]: - line_to_issues.setdefault(line_number, set()).add(msg) + for issue in static_check_issues[file_path]: + line_to_issues.setdefault(issue.line_number, set()).add((issue.message, issue.line)) for line_number in sorted(line_to_issues.keys()): - for msg in line_to_issues[line_number]: + for msg, line in line_to_issues[line_number]: line_count = '%-4s' % line_number - println(' line %s - %s' % (line_count, msg)) + println(' line %s - %-40s %s' % (line_count, msg, line.strip())) println() diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index c8fe76a..c84c58d 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -17,6 +17,8 @@ Helper functions for testing. pyflakes_issues - static checks for problems via pyflakes """ +import collections +import linecache import os import re @@ -29,6 +31,12 @@ CONFIG = stem.util.conf.config_dict('test', { 'exclude_paths': [], }) +Issue = collections.namedtuple('Issue', [ + 'line_number', + 'message', + 'line', +]) + def clean_orphaned_pyc(paths): """ @@ -145,6 +153,10 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa Renamed from get_stylistic_issues() to stylistic_issues(). The old name still works as an alias, but will be dropped in Stem version 2.0.0. + .. versionchanged:: 1.4.0 + Changing tuples in return value to be namedtuple instances, and adding the + line that had the issue. + :param list paths: paths to search for stylistic issues :param bool check_two_space_indents: check for two space indentations and that no tabs snuck in @@ -171,7 +183,7 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa code = super(StyleReport, self).error(line_number, offset, text, check) if code: - issues.setdefault(self.filename, []).append((line_number, '%s %s' % (code, text))) + issues.setdefault(self.filename, []).append(Issue(line_number, '%s %s' % (code, text), text)) style_checker = pep8.StyleGuide(ignore = CONFIG['pep8.ignore'], reporter = StyleReport) style_checker.check_files(list(_python_files(paths))) @@ -195,11 +207,11 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa is_block_comment = not is_block_comment if check_two_space_indents and '\t' in whitespace: - issues.setdefault(path, []).append((index + 1, 'indentation has a tab')) + issues.setdefault(path, []).append(Issue(index + 1, 'indentation has a tab', line)) elif check_newlines and '\r' in content: - issues.setdefault(path, []).append((index + 1, 'contains a windows newline')) + issues.setdefault(path, []).append(Issue(index + 1, 'contains a windows newline', line)) elif check_trailing_whitespace and content != content.rstrip(): - issues.setdefault(path, []).append((index + 1, 'line has trailing whitespace')) + issues.setdefault(path, []).append(Issue(index + 1, 'line has trailing whitespace', line)) elif check_exception_keyword and content.lstrip().startswith('except') and content.endswith(', exc:'): # Python 2.6 - 2.7 supports two forms for exceptions... # @@ -213,7 +225,7 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa # 'exc'. We should generalize this via a regex so other names work # too. - issues.setdefault(path, []).append((index + 1, "except clause should use 'as', not comma")) + issues.setdefault(path, []).append(Issue(index + 1, "except clause should use 'as', not comma", line)) return issues @@ -235,6 +247,10 @@ def pyflakes_issues(paths): Renamed from get_pyflakes_issues() to pyflakes_issues(). The old name still works as an alias, but will be dropped in Stem version 2.0.0. + .. versionchanged:: 1.4.0 + Changing tuples in return value to be namedtuple instances, and adding the + line that had the issue. + :param list paths: paths to search for problems :returns: dict of the form ``path => [(line_number, message)...]`` @@ -255,13 +271,13 @@ def pyflakes_issues(paths): self._ignored_issues.setdefault(path.strip(), []).append(issue.strip()) def unexpectedError(self, filename, msg): - self._register_issue(filename, None, msg) + self._register_issue(filename, None, msg, None) def syntaxError(self, filename, msg, lineno, offset, text): - self._register_issue(filename, lineno, msg) + self._register_issue(filename, lineno, msg, text) def flake(self, msg): - self._register_issue(msg.filename, msg.lineno, msg.message % msg.message_args) + self._register_issue(msg.filename, msg.lineno, msg.message % msg.message_args, None) def _is_ignored(self, path, issue): # Paths in pyflakes_ignore are relative, so we need to check to see if our @@ -273,9 +289,12 @@ def pyflakes_issues(paths): return False - def _register_issue(self, path, line_number, issue): + def _register_issue(self, path, line_number, issue, line): if not self._is_ignored(path, issue): - issues.setdefault(path, []).append((line_number, issue)) + if path and line_number and not line: + line = linecache.getline(path, line_number) + + issues.setdefault(path, []).append(Issue(line_number, issue, line)) reporter = Reporter()

1 0

[stem/master] Include standardization on single quotes in our style checks
by atagar＠torproject.org 10 Apr '15

10 Apr '15

commit fe48c81e5f08b949215e3f3ec334da68f37db819 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 10 08:55:08 2015 -0700 Include standardization on single quotes in our style checks While grepping around to standardize the nyx codebase I realized we can actually do a pretty good job of eliminating false positives. Including this in our style checks to make it easier for contributors to keep the codebase's conventions. --- run_tests.py | 2 +- stem/util/test_tools.py | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0407ece..9903c61 100755 --- a/run_tests.py +++ b/run_tests.py @@ -78,7 +78,7 @@ PYFLAKES_TASK = Task( PEP8_TASK = Task( 'running pep8', stem.util.test_tools.stylistic_issues, - args = (SRC_PATHS, True, True, True, True), + args = (SRC_PATHS, True, True, True, True, True), is_required = False, print_result = False, ) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index c84c58d..907af63 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -116,7 +116,7 @@ def is_pep8_available(): return False -def stylistic_issues(paths, check_two_space_indents = False, check_newlines = False, check_trailing_whitespace = False, check_exception_keyword = False): +def stylistic_issues(paths, check_two_space_indents = False, check_newlines = False, check_trailing_whitespace = False, check_exception_keyword = False, prefer_single_quotes = False): """ Checks for stylistic issues that are an issue according to the parts of PEP8 we conform to. You can suppress PEP8 issues by making a 'test' configuration @@ -157,6 +157,9 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa Changing tuples in return value to be namedtuple instances, and adding the line that had the issue. + .. versionchanged:: 1.4.0 + Added the prefer_single_quotes option. + :param list paths: paths to search for stylistic issues :param bool check_two_space_indents: check for two space indentations and that no tabs snuck in @@ -166,6 +169,8 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa trailing whitespace :param bool check_exception_keyword: checks that we're using 'as' for exceptions rather than a comma + :param bool prefer_single_quotes: standardize on using single rather than + double quotes for strings, when reasonable :returns: **dict** of the form ``path => [(line_number, message)...]`` """ @@ -227,6 +232,16 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa issues.setdefault(path, []).append(Issue(index + 1, "except clause should use 'as', not comma", line)) + if prefer_single_quotes and line and not is_block_comment: + content = line.strip().split('#', 1)[0] + + if '"' in content and "'" not in content and '"""' not in content: + # Checking if the line already has any single quotes since that + # usually means double quotes are preferable for the content (for + # instance "I'm hungry"). + + issues.setdefault(path, []).append(Issue(index + 1, "use single rather than double quotes", line)) + return issues

1 0

[stem/master] Better standarizing on single quotes
by atagar＠torproject.org 10 Apr '15

10 Apr '15

commit 0ac3294df858f08b6e8815e2b1188dfa4bc59123 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 10 09:18:46 2015 -0700 Better standarizing on single quotes We already standardized this codebase on single quotes several months ago but new test check found a handful of instances that slipped in since then. --- docs/republish.py | 16 ++++----- run_tests.py | 4 +-- stem/connection.py | 2 +- stem/control.py | 10 +++--- stem/descriptor/hidden_service_descriptor.py | 2 +- stem/descriptor/router_status_entry.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/exit_policy.py | 6 ++-- stem/interpreter/commands.py | 2 +- stem/util/connection.py | 2 +- stem/util/lru_cache.py | 2 +- stem/util/proc.py | 2 +- stem/util/str_tools.py | 2 +- stem/util/test_tools.py | 5 +-- test/integ/descriptor/remote.py | 2 +- test/integ/process.py | 10 +++--- test/unit/descriptor/networkstatus/document_v3.py | 10 +++--- test/unit/tutorial.py | 8 ++--- test/unit/tutorial_examples.py | 38 ++++++++++----------- test/unit/util/proc.py | 4 +-- test/unit/util/tor_tools.py | 10 +++--- 21 files changed, 71 insertions(+), 70 deletions(-) diff --git a/docs/republish.py b/docs/republish.py index 8e168b6..f2241e5 100644 --- a/docs/republish.py +++ b/docs/republish.py @@ -4,7 +4,7 @@ import subprocess import sys import time -LOGGER = logging.getLogger("republish") +LOGGER = logging.getLogger('republish') LOGGER.setLevel(logging.INFO) handler = logging.FileHandler('/home/stem/republish.log') @@ -14,8 +14,8 @@ handler.setFormatter(logging.Formatter( )) LOGGER.addHandler(handler) -OPT = "r:h" -OPT_EXPANDED = ["repeat=", "help"] +OPT = 'r:h' +OPT_EXPANDED = ['repeat=', 'help'] HELP_MSG = """\ Republishes stem's website. This can either be done or on a reoccurring basis. @@ -49,31 +49,31 @@ def republish_site(): run('sudo -u mirroradm static-master-update-component stem.torproject.org') runtime = int(time.time() - start_time) - LOGGER.log(logging.INFO, " site republished (took %s seconds)" % runtime) + LOGGER.log(logging.INFO, ' site republished (took %s seconds)' % runtime) if __name__ == '__main__': try: opts = getopt.getopt(sys.argv[1:], OPT, OPT_EXPANDED)[0] except getopt.GetoptError as exc: - print("%s (for usage provide --help)" % exc) + print('%s (for usage provide --help)' % exc) sys.exit(1) repeat_rate = None for opt, arg in opts: - if opt in ("-r", "--repeat"): + if opt in ('-r', '--repeat'): if arg.isdigit(): repeat_rate = int(arg) else: print("The --repeat argument must be an integer, got '%s'" % arg) sys.exit(1) - elif opt in ("-h", "--help"): + elif opt in ('-h', '--help'): print(HELP_MSG) sys.exit() if repeat_rate: - LOGGER.log(logging.INFO, "Starting stem site republisher") + LOGGER.log(logging.INFO, 'Starting stem site republisher') latest_run = 0 # unix timestamp for when we last ran while True: diff --git a/run_tests.py b/run_tests.py index 9903c61..8f70d09 100755 --- a/run_tests.py +++ b/run_tests.py @@ -359,10 +359,10 @@ def _run_test(args, test_class, output_filters, logging_buffer): suite = unittest.TestLoader().loadTestsFromName(test_class) except AttributeError: # should only come up if user provided '--test' for something that doesn't exist - println(" no such test", ERROR) + println(' no such test', ERROR) return None except Exception as exc: - println(" failed", ERROR) + println(' failed', ERROR) traceback.print_exc(exc) return None diff --git a/stem/connection.py b/stem/connection.py index 277ba11..fb85225 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -901,7 +901,7 @@ def authenticate_safecookie(controller, cookie_path, suppress_ctl_errors = True) raise UnrecognizedAuthChallengeMethod(authchallenge_response_str, cookie_path) elif 'Invalid base16 client nonce' in authchallenge_response_str: raise InvalidClientNonce(authchallenge_response_str, cookie_path) - elif "Cookie authentication is disabled" in authchallenge_response_str: + elif 'Cookie authentication is disabled' in authchallenge_response_str: raise CookieAuthRejected(authchallenge_response_str, cookie_path, True) else: raise AuthChallengeFailed(authchallenge_response, cookie_path) diff --git a/stem/control.py b/stem/control.py index 32e50d5..52a8de3 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1528,7 +1528,7 @@ class Controller(BaseController): raise exc if not desc_content: - raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable('Descriptor information is unavailable, tor might still be downloading it') return stem.descriptor.microdescriptor.Microdescriptor(desc_content) @@ -1636,7 +1636,7 @@ class Controller(BaseController): raise exc if not desc_content: - raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable('Descriptor information is unavailable, tor might still be downloading it') return stem.descriptor.server_descriptor.RelayDescriptor(desc_content) except Exception as exc: @@ -1679,7 +1679,7 @@ class Controller(BaseController): if not self._is_server_descriptors_available(): raise stem.ControllerError(SERVER_DESCRIPTORS_UNSUPPORTED) else: - raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable('Descriptor information is unavailable, tor might still be downloading it') for desc in stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_content)): yield desc @@ -1763,7 +1763,7 @@ class Controller(BaseController): raise exc if not desc_content: - raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable('Descriptor information is unavailable, tor might still be downloading it') if self.get_conf('UseMicrodescriptors', '0') == '1': return stem.descriptor.router_status_entry.RouterStatusEntryMicroV3(desc_content) @@ -1812,7 +1812,7 @@ class Controller(BaseController): desc_content = self.get_info('ns/all', get_bytes = True) if not desc_content: - raise stem.DescriptorUnavailable("Descriptor information is unavailable, tor might still be downloading it") + raise stem.DescriptorUnavailable('Descriptor information is unavailable, tor might still be downloading it') desc_iterator = stem.descriptor.router_status_entry._parse_file( io.BytesIO(desc_content), diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index b0a9551..fec17e4 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -302,7 +302,7 @@ class HiddenServiceDescriptor(Descriptor): raise DecryptionFailure("Unrecognized authentication type '%s', presently we only support basic auth (%s) and stealth auth (%s)" % (authentication_type, BASIC_AUTH, STEALTH_AUTH)) if not content.startswith(b'introduction-point '): - raise DecryptionFailure("Unable to decrypt the introduction-points, maybe this is the wrong key?") + raise DecryptionFailure('Unable to decrypt the introduction-points, maybe this is the wrong key?') elif not content.startswith(b'introduction-point '): raise DecryptionFailure('introduction-points content is encrypted, you need to provide its authentication_cookie') diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index c77f438..561f855 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -194,7 +194,7 @@ def _parse_s_line(descriptor, entries): for flag in flags: if flags.count(flag) > 1: raise ValueError('%s had duplicate flags: s %s' % (descriptor._name(), value)) - elif flag == "": + elif flag == '': raise ValueError("%s had extra whitespace on its 's' line: s %s" % (descriptor._name(), value)) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 9870cf2..b375066 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -760,7 +760,7 @@ class BridgeDescriptor(ServerDescriptor): if not self.address.startswith('10.'): issues.append("Router line's address should be scrubbed to be '10.x.x.x': %s" % self.address) - if self.contact and self.contact != "somebody": + if self.contact and self.contact != 'somebody': issues.append("Contact line should be scrubbed to be 'somebody', but instead had '%s'" % self.contact) for address, _, is_ipv6 in self.or_addresses: diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 5413792..62b9a12 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -133,7 +133,7 @@ def get_config_policy(rules, ip_address = None): continue if ':' not in rule: - rule = "%s:*" % rule + rule = '%s:*' % rule if 'private' in rule: acceptance = rule.split(' ', 1)[0] @@ -149,7 +149,7 @@ def get_config_policy(rules, ip_address = None): pass # we might not have a network connection for private_addr in addresses: - result.append(ExitPolicyRule("%s %s:%s" % (acceptance, private_addr, port))) + result.append(ExitPolicyRule('%s %s:%s' % (acceptance, private_addr, port))) else: result.append(ExitPolicyRule(rule)) @@ -1003,7 +1003,7 @@ class ExitPolicyRule(object): self.min_port = self.max_port = int(portspec) else: raise ValueError("'%s' isn't within a valid port range: %s" % (portspec, rule)) - elif "-" in portspec: + elif '-' in portspec: # provided with a port range port_comp = portspec.split('-', 1) diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index c87efea..f065110 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -176,7 +176,7 @@ class ControlInterpretor(code.InteractiveConsole): # being optional. if not ns_desc: - return format("Unable to find consensus information for %s" % fingerprint, *ERROR_OUTPUT) + return format('Unable to find consensus information for %s' % fingerprint, *ERROR_OUTPUT) # More likely than not we'll have the microdescriptor but not server and # extrainfo descriptors. If so then fetching them. diff --git a/stem/util/connection.py b/stem/util/connection.py index 475c7f5..88d70d5 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -492,7 +492,7 @@ def expand_ipv6_address(address): # expands collapsed groupings, there can only be a single '::' in a valid # address - if "::" in address: + if '::' in address: missing_groups = 7 - address.count(':') address = address.replace('::', '::' + ':' * missing_groups) diff --git a/stem/util/lru_cache.py b/stem/util/lru_cache.py index f1e427c..011d445 100644 --- a/stem/util/lru_cache.py +++ b/stem/util/lru_cache.py @@ -18,7 +18,7 @@ from collections import namedtuple from functools import update_wrapper from threading import RLock -_CacheInfo = namedtuple("CacheInfo", ["hits", "misses", "maxsize", "currsize"]) +_CacheInfo = namedtuple('CacheInfo', ['hits', 'misses', 'maxsize', 'currsize']) class _HashedSeq(list): diff --git a/stem/util/proc.py b/stem/util/proc.py index 05dfd65..e4a826e 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -321,7 +321,7 @@ def file_descriptors_used(pid): try: return len(os.listdir('/proc/%i/fd' % pid)) except Exception as exc: - raise IOError("Unable to check number of file descriptors used: %s" % exc) + raise IOError('Unable to check number of file descriptors used: %s' % exc) def connections(pid): diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 3cbbe9f..497564e 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -462,7 +462,7 @@ def _parse_timestamp(entry): try: time = [int(x) for x in _timestamp_re.match(entry).groups()] except AttributeError: - raise ValueError("Expected timestamp in format YYYY-MM-DD HH:MM:ss but got " + entry) + raise ValueError('Expected timestamp in format YYYY-MM-DD HH:MM:ss but got ' + entry) return datetime.datetime(time[0], time[1], time[2], time[3], time[4], time[5]) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 907af63..d6a81c4 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -235,10 +235,11 @@ def stylistic_issues(paths, check_two_space_indents = False, check_newlines = Fa if prefer_single_quotes and line and not is_block_comment: content = line.strip().split('#', 1)[0] - if '"' in content and "'" not in content and '"""' not in content: + if '"' in content and "'" not in content and '"""' not in content and not content.endswith('\\'): # Checking if the line already has any single quotes since that # usually means double quotes are preferable for the content (for - # instance "I'm hungry"). + # instance "I'm hungry"). Also checking for '\' at the end since + # that can indicate a multi-line string. issues.setdefault(path, []).append(Issue(index + 1, "use single rather than double quotes", line)) diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index 78b1add..4c7779b 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -42,7 +42,7 @@ class TestDescriptorDownloader(unittest.TestCase): continue # skip due to https://trac.torproject.org/projects/tor/ticket/14955 if getattr(auth, attr) != getattr(stem_auth, attr): - self.fail("%s has %s %s, but we expected %s" % (auth.nickname, attr, getattr(auth, attr), getattr(stem_auth, attr))) + self.fail('%s has %s %s, but we expected %s' % (auth.nickname, attr, getattr(auth, attr), getattr(stem_auth, attr))) @require_online @only_run_once diff --git a/test/integ/process.py b/test/integ/process.py index d77c46f..eec1e1e 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -87,11 +87,11 @@ class TestProcess(unittest.TestCase): output = self.run_tor('--hush', '--invalid_argument', expect_failure = True) self.assertTrue("[warn] Command-line option '--invalid_argument' with no value. Failing." in output) - self.assertTrue("[err] Reading config failed--see warnings above." in output) + self.assertTrue('[err] Reading config failed--see warnings above.' in output) output = self.run_tor('--hush', '--invalid_argument', 'true', expect_failure = True) self.assertTrue("[warn] Failed to parse/validate config: Unknown option 'invalid_argument'. Failing." in output) - self.assertTrue("[err] Reading config failed--see warnings above." in output) + self.assertTrue('[err] Reading config failed--see warnings above.' in output) def test_hash_password(self): """ @@ -101,7 +101,7 @@ class TestProcess(unittest.TestCase): """ output = self.run_tor('--hush', '--hash-password', 'my_password') - self.assertTrue(re.match("^16:[0-9A-F]{58}\n$", output)) + self.assertTrue(re.match('^16:[0-9A-F]{58}\n$', output)) # I'm not gonna even pretend to understand the following. Ported directly # from tor's test_cmdline_args.py. @@ -128,7 +128,7 @@ class TestProcess(unittest.TestCase): output = self.run_tor('--hash-password', expect_failure = True) self.assertTrue("[warn] Command-line option '--hash-password' with no value. Failing." in output) - self.assertTrue("[err] Reading config failed--see warnings above." in output) + self.assertTrue('[err] Reading config failed--see warnings above.' in output) def test_dump_config_argument(self): """ @@ -448,7 +448,7 @@ class TestProcess(unittest.TestCase): stdin = kwargs.pop('stdin', None) if kwargs: - raise ValueError("Got unexpected keyword arguments: %s" % kwargs) + raise ValueError('Got unexpected keyword arguments: %s' % kwargs) if with_torrc: args = ['-f', test.runner.get_runner().get_torrc_path()] + list(args) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index f440bbf..aaf857a 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -861,14 +861,14 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= """ test_values = ( - "foo=", - "foo=abc", - "foo=+123", - "foo=12\tbar=12", + 'foo=', + 'foo=abc', + 'foo=+123', + 'foo=12\tbar=12', ) for test_value in test_values: - content = get_network_status_document_v3({"params": test_value}, content = True) + content = get_network_status_document_v3({'params': test_value}, content = True) self.assertRaises(ValueError, NetworkStatusDocumentV3, content, True) document = NetworkStatusDocumentV3(content, False) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 7d20437..4ae82c7 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -72,7 +72,7 @@ class TestTutorial(unittest.TestCase): @app.route('/') def index(): - return "<h1>Hi Grandma!</h1>" + return '<h1>Hi Grandma!</h1>' print(' * Connecting to tor') @@ -87,14 +87,14 @@ class TestTutorial(unittest.TestCase): # Create a hidden service where visitors of port 80 get redirected to local # port 5000 (this is where flask runs by default). - print(" * Creating our hidden service in %s" % hidden_service_dir) + print(' * Creating our hidden service in %s' % hidden_service_dir) result = controller.create_hidden_service(hidden_service_dir, 80, target_port = 5000) # The hostname is only available we can read the hidden service directory. # This requires us to be running with the same user as tor. if result.hostname: - print(" * Our service is available at %s, press ctrl+c to quit" % result.hostname) + print(' * Our service is available at %s, press ctrl+c to quit' % result.hostname) else: print(" * Unable to determine our service's hostname, probably due to being unable to read the hidden service directory") @@ -105,7 +105,7 @@ class TestTutorial(unittest.TestCase): # want to delete the hidden service directory if you'd like to have this # same *.onion address in the future. - print(" * Shutting down our hidden service") + print(' * Shutting down our hidden service') controller.remove_hidden_service(hidden_service_dir) shutil.rmtree(hidden_service_dir) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 2985281..3b470f5 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -159,7 +159,7 @@ class TestTutorialExamples(unittest.TestCase): if circ.status != CircStatus.BUILT: continue - print("\nCircuit %s (%s)" % (circ.id, circ.purpose)) + print('\nCircuit %s (%s)' % (circ.id, circ.purpose)) for i, entry in enumerate(circ.path): div = '+' if (i == len(circ.path) - 1) else '|' @@ -168,7 +168,7 @@ class TestTutorialExamples(unittest.TestCase): desc = controller.get_network_status(fingerprint, None) address = desc.address if desc else 'unknown' - print(" %s- %s (%s, %s)" % (div, fingerprint, nickname, address)) + print(' %s- %s (%s, %s)' % (div, fingerprint, nickname, address)) path_1 = ('B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C', 'ByTORAndTheSnowDog') path_2 = ('0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338', 'afo02') @@ -186,13 +186,13 @@ class TestTutorialExamples(unittest.TestCase): controller.get_circuits.return_value = [circuit_4, circuit_6, circuit_10] controller.get_network_status.side_effect = lambda fingerprint, *args: { - path_1[0]: _get_router_status("173.209.180.61"), - path_2[0]: _get_router_status("87.238.194.176"), - path_3[0]: _get_router_status("109.163.234.10"), - path_4[0]: _get_router_status("46.165.197.96"), - path_5[0]: _get_router_status("96.47.226.20"), - path_6[0]: _get_router_status("86.59.119.83"), - path_7[0]: _get_router_status("176.67.169.171") + path_1[0]: _get_router_status('173.209.180.61'), + path_2[0]: _get_router_status('87.238.194.176'), + path_3[0]: _get_router_status('109.163.234.10'), + path_4[0]: _get_router_status('46.165.197.96'), + path_5[0]: _get_router_status('96.47.226.20'), + path_6[0]: _get_router_status('86.59.119.83'), + path_7[0]: _get_router_status('176.67.169.171') }[fingerprint] tutorial_example() @@ -225,11 +225,11 @@ class TestTutorialExamples(unittest.TestCase): exit_fingerprint = circ.path[-1][0] exit_relay = controller.get_network_status(exit_fingerprint) - print("Exit relay for our connection to %s" % (event.target)) - print(" address: %s:%i" % (exit_relay.address, exit_relay.or_port)) - print(" fingerprint: %s" % exit_relay.fingerprint) - print(" nickname: %s" % exit_relay.nickname) - print(" locale: %s\n" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown')) + print('Exit relay for our connection to %s' % (event.target)) + print(' address: %s:%i' % (exit_relay.address, exit_relay.or_port)) + print(' fingerprint: %s' % exit_relay.fingerprint) + print(' nickname: %s' % exit_relay.nickname) + print(' locale: %s\n' % controller.get_info('ip-to-country/%s' % exit_relay.address, 'unknown')) main() @@ -259,17 +259,17 @@ class TestTutorialExamples(unittest.TestCase): downloader = DescriptorDownloader() count, with_contact = 0, 0 - print("Checking for outdated relays...\n") + print('Checking for outdated relays...\n') for desc in downloader.get_server_descriptors(): if desc.tor_version < Version('0.2.3.0'): count += 1 if desc.contact: - print(' %-15s %s' % (desc.tor_version, desc.contact.decode("utf-8", "replace"))) + print(' %-15s %s' % (desc.tor_version, desc.contact.decode('utf-8', 'replace'))) with_contact += 1 - print("\n%i outdated relays found, %i had contact information" % (count, with_contact)) + print('\n%i outdated relays found, %i had contact information' % (count, with_contact)) downloader_mock().get_server_descriptors.return_value = [ get_relay_server_descriptor({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), @@ -399,7 +399,7 @@ class TestTutorialExamples(unittest.TestCase): print(' %i measured entries and %i unmeasured' % (measured, unmeasured)) except Exception as exc: - print(" failed to get the vote (%s)" % exc) + print(' failed to get the vote (%s)' % exc) directory_values = [ DIRECTORY_AUTHORITIES['gabelmoo'], @@ -460,7 +460,7 @@ class TestTutorialExamples(unittest.TestCase): )) for fingerprint, relay in consensus.routers.items(): - print("%s: %s" % (fingerprint, relay.nickname)) + print('%s: %s' % (fingerprint, relay.nickname)) network_status = get_network_status_document_v3(routers = (get_router_status_entry_v3(),)) query_mock().run.return_value = [network_status] diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index d1fb4aa..ea206b8 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -164,9 +164,9 @@ class TestProc(unittest.TestCase): try: proc.file_descriptors_used(2118) - self.fail("We should raise when listdir() fails") + self.fail('We should raise when listdir() fails') except IOError as exc: - expected = "Unable to check number of file descriptors used: %s" % error_msg + expected = 'Unable to check number of file descriptors used: %s' % error_msg self.assertEqual(expected, str(exc)) # successful calls diff --git a/test/unit/util/tor_tools.py b/test/unit/util/tor_tools.py index 80362f7..c0881db 100644 --- a/test/unit/util/tor_tools.py +++ b/test/unit/util/tor_tools.py @@ -92,8 +92,8 @@ class TestTorTools(unittest.TestCase): """ valid_hex_digits = ( - "12345", - "AbCdE", + '12345', + 'AbCdE', ) invalid_hex_digits = ( @@ -101,9 +101,9 @@ class TestTorTools(unittest.TestCase): '', 5, 'X', - "1234", - "ABCDEF", - [1, "2", (3, 4)] + '1234', + 'ABCDEF', + [1, '2', (3, 4)] ) for hex_digits in valid_hex_digits:

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Apr '15

10 Apr '15

commit 366a9b30a568cba52c94fbb69a0bd8043bdbcb52 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 10 16:15:47 2015 +0000 Update translations for torbutton-torbuttondtd --- ca/torbutton.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd index 10d1c26..83f2b1a 100644 --- a/ca/torbutton.dtd +++ b/ca/torbutton.dtd @@ -154,17 +154,17 @@ <!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat"> <!ENTITY torbutton.prefs.sec_low "Baix (per defecte)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_desc "En aquest nivell de seguretat, totes les característiques del navegador estan activades. "> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "El mecanisme de renderització de tipus de lletra SVG Opentype està desactivat"> <!ENTITY torbutton.prefs.sec_med_low "Mitjà-baix"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_gen_desc "En aquest nivell de seguretat s'apliquen els canvis següents (passeu el cursor per sobre per a més detalls):"> +<!ENTITY torbutton.prefs.sec_html5_desc "Els Vídeos HTML5 i els documents d'audio esdevenen reproduïbles amb un click mitjançant el NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "En alguns llocs haureu de fer servir el botó NoScript de la barra d'eines per activar aquests objectes audiovisuals."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Algunes optimitzacions de realització del JavaScript estan desactivades. "> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Inferència de Tipus, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Els Scripts d'alguns llocs poden funcionar més lentament. "> +<!ENTITY torbutton.prefs.sec_jar_desc "Els fitxers remots JAR estan bloquejats. "> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled.">

1 0

[tor-browser-bundle/master] Update meek to 0.17.
by gk＠torproject.org 10 Apr '15

10 Apr '15

commit 25dc8d416325f01ca046a70afc115e57c37c7b43 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 5 23:36:27 2015 +0000 Update meek to 0.17. Removes --exit-on-stdin-eof from meek-client-torbrowser command; now handled by the TOR_PT_EXIT_ON_STDIN_CLOSE environment variable. --- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index f287e3e..ad1eb07 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -12,4 +12,4 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\Pluggab ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 ## meek configuration -ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser --exit-on-stdin-eof -- TorBrowser\Tor\PluggableTransports\meek-client +ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/versions b/gitian/versions index 4b0c9a4..a2f7817 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6976ea8..ee69d08 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.beta b/gitian/versions.beta index efb4bfb..673b2e5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-messenger-build/master] Use an older mozilla commit on Windows
by boklm＠torproject.org 10 Apr '15

10 Apr '15

commit df794df6f8685be3ab2661eafb96ba39707bc533 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 16:54:01 2015 +0200 Use an older mozilla commit on Windows Until the build is fixed on master. --- projects/mozilla/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/mozilla/config b/projects/mozilla/config index ea23187..a7dadb9 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -9,3 +9,9 @@ src: | steps: src: filename: "mozilla-[% c('version') %]-src.tar.gz" + +targets: + windows-i686: + # master does not currently build with mingw-w64, so we are + # staying with an older commit until the problem is fixed. + git_hash: efd5e9084a29e91c05b1fd9b26a56f424b73ac50

1 0