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

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit f5569fe79a02413b0096d783763ece1cafb38865 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 19:45:29 2014 +0000 Update translations for tor-launcher-properties --- nb/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index 14659b3..9dac98a 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -7,8 +7,8 @@ torlauncher.tor_exited=Tor ble uventet avsluttet. torlauncher.please_restart_app=Vennligst start denne applikasjonen på nytt. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed=Tor fikk ikke etablert en forbindelse til Tor-nettverket. +torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S). torlauncher.unable_to_start_tor=Kunne ikke starte Tor.\n\n%S torlauncher.tor_missing=Den kjørbare Tor-filen finnes ikke.

1 0

[tor-browser-bundle/master] Pick up a new Tor Browser tag for correct langpack fix.
by mikeperry＠torproject.org 13 Feb '14

13 Feb '14

commit 2e63be6daae3cb3c4b5a55f53bf1d58a89aa80a9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 13 19:21:46 2014 +0000 Pick up a new Tor Browser tag for correct langpack fix. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index ccf400b..60d8b5a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build1 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 9f166f2..cc673e0 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build1 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 TOR_TAG=tor-0.2.5.1-alpha TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.beta b/gitian/versions.beta index 5ca8d2e..b556ffe 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build1 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0

1 0

[tor-browser/tor-browser-24.3.0esr-2] fixup! Bug 10895: Fix language pack usage.
by mikeperry＠torproject.org 13 Feb '14

13 Feb '14

commit bd0a4271bc20d4c98ef310c42cdef7abf4ff82a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 13 19:20:16 2014 +0000 fixup! Bug 10895: Fix language pack usage. We need to strip esr too. --- browser/config/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 02a8bfe..e9a9b45 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.3.0esr +24.3.0

1 0

[arm/master] Taking advantage of stem's new stem.util.test_tools
by atagar＠torproject.org 13 Feb '14

13 Feb '14

commit 386344b961ad028d546c30211e8313a596b6c442 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Feb 13 09:28:50 2014 -0800 Taking advantage of stem's new stem.util.test_tools Clearing out a big chunk of code we copied from stem now that it's available in its utils. --- run_tests.py | 193 +++------------------------------------------------------- 1 file changed, 9 insertions(+), 184 deletions(-) diff --git a/run_tests.py b/run_tests.py index 2c5b380..31e82fb 100755 --- a/run_tests.py +++ b/run_tests.py @@ -8,19 +8,13 @@ the test coverage we can achieve, but exercising what we can. """ import os -import re import unittest import stem.util.conf -import stem.util.system +import stem.util.test_tools from arm.util import load_settings -CONFIG = stem.util.conf.config_dict("test", { - "pep8.ignore": [], - "pyflakes.ignore": [], -}) - ARM_BASE = os.path.dirname(__file__) SRC_PATHS = [os.path.join(ARM_BASE, path) for path in ( @@ -37,7 +31,10 @@ def main(): test_config = stem.util.conf.get_config("test") test_config.load(os.path.join(ARM_BASE, "test", "settings.cfg")) - clean_orphaned_pyc() + orphaned_pyc = stem.util.test_tools.clean_orphaned_pyc(ARM_BASE) + + for path in orphaned_pyc: + print "Deleted orphaned pyc file: %s" % path tests = unittest.defaultTestLoader.discover('test', pattern='*.py') test_runner = unittest.TextTestRunner() @@ -47,13 +44,13 @@ def main(): static_check_issues = {} - if is_pyflakes_available(): - for path, issues in get_pyflakes_issues(SRC_PATHS).items(): + if stem.util.test_tools.is_pyflakes_available(): + for path, issues in stem.util.test_tools.get_pyflakes_issues(SRC_PATHS).items(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) - if is_pep8_available(): - for path, issues in get_stylistic_issues(SRC_PATHS).items(): + 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(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) @@ -70,177 +67,5 @@ def main(): print -def clean_orphaned_pyc(): - for root, _, files in os.walk(os.path.dirname(__file__)): - for filename in files: - if filename.endswith('.pyc'): - pyc_path = os.path.join(root, filename) - - if "__pycache__" in pyc_path: - continue - - if not os.path.exists(pyc_path[:-1]): - print "Deleting orphaned pyc file: %s" % pyc_path - os.remove(pyc_path) - - -def is_pyflakes_available(): - """ - Checks if pyflakes is availalbe. - - :returns: **True** if we can use pyflakes and **False** otherwise - """ - - try: - import pyflakes - return True - except ImportError: - return False - - -def is_pep8_available(): - """ - Checks if pep8 is availalbe. - - :returns: **True** if we can use pep8 and **False** otherwise - """ - - try: - import pep8 - return True - except ImportError: - return False - - -def get_stylistic_issues(paths): - """ - Checks for stylistic issues that are an issue according to the parts of PEP8 - we conform to. This alsochecks a few other stylistic issues: - - * two space indentations - * tabs are the root of all evil and should be shot on sight - * standard newlines (\\n), not windows (\\r\\n) nor classic mac (\\r) - * checks that we're using 'as' for exceptions rather than a comma - - :param list paths: paths to search for stylistic issues - - :returns: **dict** of the form ``path => [(line_number, message)...]`` - """ - - issues = {} - - if is_pep8_available(): - import pep8 - - class StyleReport(pep8.BaseReport): - def __init__(self, options): - super(StyleReport, self).__init__(options) - - def error(self, line_number, offset, text, check): - code = super(StyleReport, self).error(line_number, offset, text, check) - - if code: - issues.setdefault(self.filename, []).append((offset + line_number, "%s %s" % (code, text))) - - style_checker = pep8.StyleGuide(ignore = CONFIG["pep8.ignore"], reporter = StyleReport) - style_checker.check_files(_python_files(paths)) - - for path in _python_files(paths): - with open(path) as f: - file_contents = f.read() - - lines, prev_indent = file_contents.split("\n"), 0 - is_block_comment = False - - for index, line in enumerate(lines): - whitespace, content = re.match("^(\s*)(.*)$", line).groups() - - # TODO: This does not check that block indentations are two spaces - # because differentiating source from string blocks ("""foo""") is more - # of a pita than I want to deal with right now. - - if '"""' in content: - is_block_comment = not is_block_comment - - if "\t" in whitespace: - issues.setdefault(path, []).append((index + 1, "indentation has a tab")) - elif "\r" in content: - issues.setdefault(path, []).append((index + 1, "contains a windows newline")) - elif content != content.rstrip(): - issues.setdefault(path, []).append((index + 1, "line has trailing whitespace")) - elif content.lstrip().startswith("except") and content.endswith(", exc:"): - # Python 2.6 - 2.7 supports two forms for exceptions... - # - # except ValueError, exc: - # except ValueError as exc: - # - # The former is the old method and no longer supported in python 3 - # going forward. - - issues.setdefault(path, []).append((index + 1, "except clause should use 'as', not comma")) - - return issues - - -def get_pyflakes_issues(paths): - """ - Performs static checks via pyflakes. - - :param list paths: paths to search for problems - - :returns: dict of the form ``path => [(line_number, message)...]`` - """ - - issues = {} - - if is_pyflakes_available(): - import pyflakes.api - import pyflakes.reporter - - class Reporter(pyflakes.reporter.Reporter): - def __init__(self): - self._ignored_issues = {} - - for line in CONFIG["pyflakes.ignore"]: - path, issue = line.split("=>") - self._ignored_issues.setdefault(path.strip(), []).append(issue.strip()) - - def unexpectedError(self, filename, msg): - self._register_issue(filename, None, msg) - - def syntaxError(self, filename, msg, lineno, offset, text): - self._register_issue(filename, lineno, msg) - - def flake(self, msg): - self._register_issue(msg.filename, msg.lineno, msg.message % msg.message_args) - - def _is_ignored(self, path, issue): - # Paths in pyflakes_ignore are relative, so we need to check to see if our - # path ends with any of them. - - for ignored_path, ignored_issues in self._ignored_issues.items(): - if path.endswith(ignored_path) and issue in ignored_issues: - return True - - return False - - def _register_issue(self, path, line_number, issue): - if not self._is_ignored(path, issue): - issues.setdefault(path, []).append((line_number, issue)) - - reporter = Reporter() - - for path in _python_files(paths): - pyflakes.api.checkPath(path, reporter) - - return issues - - -def _python_files(paths): - for path in paths: - for file_path in stem.util.system.files_with_suffix(path, '.py'): - yield file_path - - if __name__ == '__main__': main()

1 0

[stem/master] Moving pep8 and pyflakes helpers to stem.util.test_tools
by atagar＠torproject.org 13 Feb '14

13 Feb '14

commit a254e5ff8529db70756758782a9a2646a71a1d94 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Feb 13 09:06:50 2014 -0800 Moving pep8 and pyflakes helpers to stem.util.test_tools Twice now I've copied the part of stem's test/util.py for performing pyflakes and pep8 checks (for both arm and ExitMap). I don't want to vend this functionality but it's silly for us to keep copying this functionality. Generalizing the helper functions and moving them to our util. Like the log module, this has a note that it is not something we vend and that users should not rely on it to have a backward compatible API. --- run_tests.py | 15 +-- stem/util/__init__.py | 1 + stem/util/test_tools.py | 288 +++++++++++++++++++++++++++++++++++++++++++++++ test/settings.cfg | 5 +- test/util.py | 204 +-------------------------------- 5 files changed, 303 insertions(+), 210 deletions(-) diff --git a/run_tests.py b/run_tests.py index ae10df9..2524756 100755 --- a/run_tests.py +++ b/run_tests.py @@ -20,6 +20,7 @@ import stem.util.conf import stem.util.enum import stem.util.log import stem.util.system +import stem.util.test_tools import test.output import test.runner @@ -90,7 +91,7 @@ https://pypi.python.org/pypi/mock/ PYFLAKES_TASK = Task( "running pyflakes", - test.util.get_pyflakes_issues, + stem.util.test_tools.get_pyflakes_issues, args = (SRC_PATHS,), is_required = False, print_result = False, @@ -98,8 +99,8 @@ PYFLAKES_TASK = Task( PEP8_TASK = Task( "running pep8", - test.util.get_stylistic_issues, - args = (SRC_PATHS,), + stem.util.test_tools.get_stylistic_issues, + args = (SRC_PATHS, True, True, True, True), is_required = False, print_result = False, ) @@ -154,10 +155,10 @@ def main(): pyflakes_task, pep8_task = None, None if not stem.prereq.is_python_3() and not args.specific_test: - if test.util.is_pyflakes_available(): + if stem.util.test_tools.is_pyflakes_available(): pyflakes_task = PYFLAKES_TASK - if test.util.is_pep8_available(): + if stem.util.test_tools.is_pep8_available(): pep8_task = PEP8_TASK test.util.run_tasks( @@ -296,14 +297,14 @@ def main(): for path, issues in pyflakes_task.result.items(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) - elif not test.util.is_pyflakes_available(): + elif not stem.util.test_tools.is_pyflakes_available(): println("Static error checking requires pyflakes version 0.7.3 or later. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", ERROR) if pep8_task and pep8_task.is_successful: for path, issues in pep8_task.result.items(): for issue in issues: static_check_issues.setdefault(path, []).append(issue) - elif not test.util.is_pep8_available(): + elif not stem.util.test_tools.is_pep8_available(): println("Style checks require pep8 version 1.4.2 or later. Please install it from...\n http://pypi.python.org/pypi/pep8\n", ERROR) _print_static_issues(static_check_issues) diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 339a62a..5885e47 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -15,5 +15,6 @@ __all__ = [ "proc", "system", "term", + "test_tools", "tor_tools", ] diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py new file mode 100644 index 0000000..f97189a --- /dev/null +++ b/stem/util/test_tools.py @@ -0,0 +1,288 @@ +# Copyright 2014, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Helper functions for testing. + +**Stem users are more than welcome to use these for their own test runs, but +these functions are not being vended to our users. They may change in the +future, use them at your own risk.** + +:: + + clean_orphaned_pyc - delete *.pyc files without corresponding *.py + + is_pyflakes_available - checks if pyflakes is available + is_pep8_available - checks if pep8 is available + + get_stylistic_issues - checks for PEP8 and other stylistic issues + get_pyflakes_issues - static checks for problems via pyflakes +""" + +import os +import re + +import stem.util.conf +import stem.util.system + +CONFIG = stem.util.conf.config_dict("test", { + "pep8.ignore": [], + "pyflakes.ignore": [], + "exclude_paths": [], +}) + + +def clean_orphaned_pyc(paths): + """ + Deletes any file with a *.pyc extention without a corresponding *.py. This + helps to address a common gotcha when deleting python files... + + * You delete module 'foo.py' and run the tests to ensure that you haven't + broken anything. They pass, however there *are* still some 'import foo' + statements that still work because the bytecode (foo.pyc) is still around. + + * You push your change. + + * Another developer clones our repository and is confused because we have a + bunch of ImportErrors. + + :param list paths: paths to search for orphaned pyc files + + :returns: list of absolute paths that were deleted + """ + + orphaned_pyc = [] + + for path in paths: + for pyc_path in stem.util.system.files_with_suffix(path, '.pyc'): + # If we're running python 3 then the *.pyc files are no longer bundled + # with the *.py. Rather, they're in a __pycache__ directory. + + # TODO: At the moment there's no point in checking for orphaned bytecode + # with python 3 because it's an exported copy of the python 2 codebase, + # so skipping. However, we might want to address this for other callers. + + if "__pycache__" in pyc_path: + continue + + if not os.path.exists(pyc_path[:-1]): + orphaned_pyc.append(pyc_path) + os.remove(pyc_path) + + return orphaned_pyc + + +def is_pyflakes_available(): + """ + Checks if pyflakes is availalbe. + + :returns: **True** if we can use pyflakes and **False** otherwise + """ + + try: + import pyflakes.api + import pyflakes.reporter + return True + except ImportError: + return False + + +def is_pep8_available(): + """ + Checks if pep8 is availalbe. + + :returns: **True** if we can use pep8 and **False** otherwise + """ + + try: + import pep8 + + if not hasattr(pep8, 'BaseReport'): + raise ImportError() + + return True + except ImportError: + return False + + +def get_stylistic_issues(paths, check_two_space_indents = False, check_newlines = False, check_trailing_whitespace = False, check_exception_keyword = 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 + that sets 'pep8.ignore'. + + For example, with a 'test/settings.cfg' of... + + :: + + # PEP8 compliance issues that we're ignoreing... + # + # * E111 and E121 four space indentations + # * E501 line is over 79 characters + + pep8.ignore E111 + pep8.ignore E121 + pep8.ignore E501 + + ... you can then run tests with... + + :: + + import stem.util.conf + + test_config = stem.util.conf.get_config('test') + test_config.load('test/settings.cfg') + + issues = get_stylistic_issues('my_project') + + If a 'exclude_paths' was set in our test config then we exclude any absolute + paths matching those regexes. + + :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 + :param bool check_newlines: check that we have standard newlines (\\n), not + windows (\\r\\n) nor classic mac (\\r) + :param bool check_trailing_whitespace: check that our lines don't end with + trailing whitespace + :param bool check_exception_keyword: checks that we're using 'as' for + exceptions rather than a comma + + :returns: **dict** of the form ``path => [(line_number, message)...]`` + """ + + issues = {} + + if is_pep8_available(): + import pep8 + + class StyleReport(pep8.BaseReport): + def __init__(self, options): + super(StyleReport, self).__init__(options) + + def error(self, line_number, offset, text, check): + code = super(StyleReport, self).error(line_number, offset, text, check) + + if code: + issues.setdefault(self.filename, []).append((offset + line_number, "%s %s" % (code, text))) + + style_checker = pep8.StyleGuide(ignore = CONFIG['pep8.ignore'], reporter = StyleReport) + style_checker.check_files(list(_python_files(paths))) + + if check_two_space_indents or check_newlines or check_trailing_whitespace or check_exception_keyword: + for path in _python_files(paths): + with open(path) as f: + file_contents = f.read() + + lines, prev_indent = file_contents.split("\n"), 0 + is_block_comment = False + + for index, line in enumerate(lines): + whitespace, content = re.match("^(\s*)(.*)$", line).groups() + + # TODO: This does not check that block indentations are two spaces + # because differentiating source from string blocks ("""foo""") is more + # of a pita than I want to deal with right now. + + if '"""' in content: + 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")) + elif check_newlines and "\r" in content: + issues.setdefault(path, []).append((index + 1, "contains a windows newline")) + elif check_trailing_whitespace and content != content.rstrip(): + issues.setdefault(path, []).append((index + 1, "line has trailing whitespace")) + elif check_exception_keyword and content.lstrip().startswith("except") and content.endswith(", exc:"): + # Python 2.6 - 2.7 supports two forms for exceptions... + # + # except ValueError, exc: + # except ValueError as exc: + # + # The former is the old method and no longer supported in python 3 + # going forward. + + # TODO: This check only works if the exception variable is called + # '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")) + + return issues + + +def get_pyflakes_issues(paths): + """ + Performs static checks via pyflakes. False positives can be ignored via + 'pyflakes.ignore' entries in our 'test' config. For instance... + + :: + + pyflakes.ignore stem/util/test_tools.py => 'pyflakes' imported but unused + pyflakes.ignore stem/util/test_tools.py => 'pep8' imported but unused + + If a 'exclude_paths' was set in our test config then we exclude any absolute + paths matching those regexes. + + :param list paths: paths to search for problems + + :returns: dict of the form ``path => [(line_number, message)...]`` + """ + + issues = {} + + if is_pyflakes_available(): + import pyflakes.api + import pyflakes.reporter + + class Reporter(pyflakes.reporter.Reporter): + def __init__(self): + self._ignored_issues = {} + + for line in CONFIG["pyflakes.ignore"]: + path, issue = line.split("=>") + self._ignored_issues.setdefault(path.strip(), []).append(issue.strip()) + + def unexpectedError(self, filename, msg): + self._register_issue(filename, None, msg) + + def syntaxError(self, filename, msg, lineno, offset, text): + self._register_issue(filename, lineno, msg) + + def flake(self, msg): + self._register_issue(msg.filename, msg.lineno, msg.message % msg.message_args) + + def _is_ignored(self, path, issue): + # Paths in pyflakes_ignore are relative, so we need to check to see if our + # path ends with any of them. + + for ignored_path, ignored_issues in self._ignored_issues.items(): + if path.endswith(ignored_path) and issue in ignored_issues: + return True + + return False + + def _register_issue(self, path, line_number, issue): + if not self._is_ignored(path, issue): + issues.setdefault(path, []).append((line_number, issue)) + + reporter = Reporter() + + for path in _python_files(paths): + pyflakes.api.checkPath(path, reporter) + + return issues + + +def _python_files(paths): + for path in paths: + for file_path in stem.util.system.files_with_suffix(path, '.py'): + skip = False + + for exclude_path in CONFIG["exclude_paths"]: + if re.match(exclude_path, file_path): + skip = True + break + + if not skip: + yield file_path diff --git a/test/settings.cfg b/test/settings.cfg index fd960a1..f12311d 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -16,6 +16,7 @@ # 'run_tests.py'. Logging is disabled if set ot an empty value. integ.test_directory ./test/data +exclude_paths .*/stem/test/data/.* integ.log ./test/data/log # The following are less testing framework attributes that aren't as commonly @@ -135,10 +136,10 @@ pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'unittest' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused +pyflakes.ignore stem/util/test_tools.py => 'pyflakes' imported but unused +pyflakes.ignore stem/util/test_tools.py => 'pep8' imported but unused pyflakes.ignore test/mocking.py => undefined name 'test' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names -pyflakes.ignore test/util.py => 'pyflakes' imported but unused -pyflakes.ignore test/util.py => 'pep8' imported but unused # Test modules we want to run. Modules are roughly ordered by the dependencies # so the lowest level tests come first. This is because a problem in say, diff --git a/test/util.py b/test/util.py index 384f9b6..52ea8f8 100644 --- a/test/util.py +++ b/test/util.py @@ -9,15 +9,10 @@ Helper functions for our test framework. get_unit_tests - provides our unit tests get_integ_tests - provides our integration tests - is_pyflakes_available - checks if pyflakes is available - is_pep8_available - checks if pep8 is available - get_prereq - provides the tor version required to run the given target get_torrc_entries - provides the torrc entries for a given target get_help_message - provides usage information for running our tests get_python3_destination - location where a python3 copy of stem is exported to - get_stylistic_issues - checks for PEP8 and other stylistic issues - get_pyflakes_issues - static checks for problems via pyflakes Sets of :class:`~test.util.Task` instances can be ran with :func:`~test.util.run_tasks`. Functions that are intended for easy use with @@ -50,6 +45,7 @@ import stem import stem.prereq import stem.util.conf import stem.util.system +import stem.util.test_tools import stem.version import test.output @@ -61,8 +57,6 @@ CONFIG = stem.util.conf.config_dict("test", { "target.description": {}, "target.prereq": {}, "target.torrc": {}, - "pep8.ignore": [], - "pyflakes.ignore": [], "integ.test_directory": "./test/data", "test.unit_tests": "", "test.integ_tests": "", @@ -158,39 +152,6 @@ def get_help_message(): return help_msg -def is_pyflakes_available(): - """ - Checks if pyflakes is availalbe. - - :returns: **True** if we can use pyflakes and **False** otherwise - """ - - try: - import pyflakes.api - import pyflakes.reporter - return True - except ImportError: - return False - - -def is_pep8_available(): - """ - Checks if pep8 is availalbe. - - :returns: **True** if we can use pep8 and **False** otherwise - """ - - try: - import pep8 - - if not hasattr(pep8, 'BaseReport'): - raise ImportError() - - return True - except ImportError: - return False - - def get_prereq(target): """ Provides the tor version required to run the given target. If the target @@ -250,130 +211,6 @@ def get_python3_destination(): return os.path.join(CONFIG["integ.test_directory"], "python3") -def get_stylistic_issues(paths): - """ - Checks for stylistic issues that are an issue according to the parts of PEP8 - we conform to. This alsochecks a few other stylistic issues: - - * two space indentations - * tabs are the root of all evil and should be shot on sight - * standard newlines (\\n), not windows (\\r\\n) nor classic mac (\\r) - * checks that we're using 'as' for exceptions rather than a comma - - :param list paths: paths to search for stylistic issues - - :returns: **dict** of the form ``path => [(line_number, message)...]`` - """ - - issues = {} - - if is_pep8_available(): - import pep8 - - class StyleReport(pep8.BaseReport): - def __init__(self, options): - super(StyleReport, self).__init__(options) - - def error(self, line_number, offset, text, check): - code = super(StyleReport, self).error(line_number, offset, text, check) - - if code: - issues.setdefault(self.filename, []).append((offset + line_number, "%s %s" % (code, text))) - - style_checker = pep8.StyleGuide(ignore = CONFIG["pep8.ignore"], reporter = StyleReport) - style_checker.check_files(list(_python_files(paths))) - - for path in _python_files(paths): - with open(path) as f: - file_contents = f.read() - - lines, prev_indent = file_contents.split("\n"), 0 - is_block_comment = False - - for index, line in enumerate(lines): - whitespace, content = re.match("^(\s*)(.*)$", line).groups() - - # TODO: This does not check that block indentations are two spaces - # because differentiating source from string blocks ("""foo""") is more - # of a pita than I want to deal with right now. - - if '"""' in content: - is_block_comment = not is_block_comment - - if "\t" in whitespace: - issues.setdefault(path, []).append((index + 1, "indentation has a tab")) - elif "\r" in content: - issues.setdefault(path, []).append((index + 1, "contains a windows newline")) - elif content != content.rstrip(): - issues.setdefault(path, []).append((index + 1, "line has trailing whitespace")) - elif content.lstrip().startswith("except") and content.endswith(", exc:"): - # Python 2.6 - 2.7 supports two forms for exceptions... - # - # except ValueError, exc: - # except ValueError as exc: - # - # The former is the old method and no longer supported in python 3 - # going forward. - - issues.setdefault(path, []).append((index + 1, "except clause should use 'as', not comma")) - - return issues - - -def get_pyflakes_issues(paths): - """ - Performs static checks via pyflakes. - - :param list paths: paths to search for problems - - :returns: dict of the form ``path => [(line_number, message)...]`` - """ - - issues = {} - - if is_pyflakes_available(): - import pyflakes.api - import pyflakes.reporter - - class Reporter(pyflakes.reporter.Reporter): - def __init__(self): - self._ignored_issues = {} - - for line in CONFIG["pyflakes.ignore"]: - path, issue = line.split("=>") - self._ignored_issues.setdefault(path.strip(), []).append(issue.strip()) - - def unexpectedError(self, filename, msg): - self._register_issue(filename, None, msg) - - def syntaxError(self, filename, msg, lineno, offset, text): - self._register_issue(filename, lineno, msg) - - def flake(self, msg): - self._register_issue(msg.filename, msg.lineno, msg.message % msg.message_args) - - def _is_ignored(self, path, issue): - # Paths in pyflakes_ignore are relative, so we need to check to see if our - # path ends with any of them. - - for ignored_path, ignored_issues in self._ignored_issues.items(): - if path.endswith(ignored_path) and issue in ignored_issues: - return True - - return False - - def _register_issue(self, path, line_number, issue): - if not self._is_ignored(path, issue): - issues.setdefault(path, []).append((line_number, issue)) - - reporter = Reporter() - - for path in _python_files(paths): - pyflakes.api.checkPath(path, reporter) - - return issues - - def check_stem_version(): return stem.__version__ @@ -420,40 +257,12 @@ def check_pep8_version(): def clean_orphaned_pyc(paths): """ - Deletes any file with a *.pyc extention without a corresponding *.py. This - helps to address a common gotcha when deleting python files... - - * You delete module 'foo.py' and run the tests to ensure that you haven't - broken anything. They pass, however there *are* still some 'import foo' - statements that still work because the bytecode (foo.pyc) is still around. - - * You push your change. - - * Another developer clones our repository and is confused because we have a - bunch of ImportErrors. + Deletes any file with a *.pyc extention without a corresponding *.py. :param list paths: paths to search for orphaned pyc files """ - orphaned_pyc = [] - - for path in paths: - for pyc_path in stem.util.system.files_with_suffix(path, '.pyc'): - # If we're running python 3 then the *.pyc files are no longer bundled - # with the *.py. Rather, they're in a __pycache__ directory. - # - # At the moment there's no point in checking for orphaned bytecode with - # python 3 because it's an exported copy of the python 2 codebase, so - # skipping. - - if "__pycache__" in pyc_path: - continue - - if not os.path.exists(pyc_path[:-1]): - orphaned_pyc.append(pyc_path) - os.remove(pyc_path) - - return ["removed %s" % path for path in orphaned_pyc] + return ["removed %s" % path for path in stem.util.test_tools.clean_orphaned_pyc(paths)] def check_for_unused_tests(paths): @@ -570,13 +379,6 @@ def run_tasks(category, *tasks): println() -def _python_files(paths): - for path in paths: - for file_path in stem.util.system.files_with_suffix(path, '.py'): - if not _is_test_data(file_path): - yield file_path - - class Task(object): """ Task we can process while running our tests. The runner can return either a

1 0

[torbutton/master] Bug 10611: Add Sweedish (sv) to extra locales to update.
by mikeperry＠torproject.org 13 Feb '14

13 Feb '14

commit 18aba4a50c33bde95ec839bf1fbc48e0bbea769a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 13 16:43:23 2014 +0000 Bug 10611: Add Sweedish (sv) to extra locales to update. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 8d1fb98..e1cb721 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -9,7 +9,7 @@ BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru vi zh-CN" # so Basque XPIs can be build independently. We can do # this for other languages too, if anyone requests this # and translations are available. -BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja" +BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" if [ -d translation ]; then

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 35d04699b2d767b534006ff808dfbb8df55c59bd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 16:45:42 2014 +0000 Update translations for abouttor-homepage --- ko/aboutTor.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ko/aboutTor.dtd b/ko/aboutTor.dtd index 6b7c90f..71b58b3 100644 --- a/ko/aboutTor.dtd +++ b/ko/aboutTor.dtd @@ -16,8 +16,8 @@ <!ENTITY aboutTor.success2.label "이 브라우저는 Tor를 사용하도록 구성되었습니다."> <!ENTITY aboutTor.success3.label "여러분은 이제 익명으로 자유롭게 인터넷을 탐색 할 수 있습니다."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> +<!ENTITY aboutTor.failure2.label "Tor가 이 브라우저에서 작동하지 않습니다."> +<!ENTITY aboutTor.failure3prefix.label "도움이 필요한 경우 접속하시길 바랍니다."> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label " "> @@ -42,8 +42,8 @@ <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with "> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "with"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with"> <!ENTITY aboutTor.searchSP.search.label "시작 페이지"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> @@ -53,8 +53,8 @@ <!ENTITY aboutTor.torInfo1.label "추가 정보 :"> <!ENTITY aboutTor.torInfo2.label "국가 & IP 주소 :"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> +<!ENTITY aboutTor.torInfo3.label "출구 node : "> +<!ENTITY aboutTor.torInfo4.label "이 서버는 방문자에 대한 정보를 기록하지 않습니다."> <!ENTITY aboutTor.whatnextQuestion.label "What Next?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "익명으로 알짱거릴 때의 팁 >>">

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 357d21a13ddd8f56288be09a3caddb3708ed9c59 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 16:45:32 2014 +0000 Update translations for mat-gui --- ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko.po b/ko.po index 7f3837c..8cc8ece 100644 --- a/ko.po +++ b/ko.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-10 01:04+0000\n" -"PO-Revision-Date: 2014-02-13 16:12+0000\n" +"PO-Revision-Date: 2014-02-13 16:20+0000\n" "Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

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

13 Feb '14

commit 4319a467eb8155aa0d9c60f83916373b53f163d2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 16:45:23 2014 +0000 Update translations for tails-persistence-setup --- ko/ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/ko.po b/ko/ko.po index f14d1b2..6d415e2 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-01-18 21:00+0100\n" -"PO-Revision-Date: 2014-02-13 16:13+0000\n" +"PO-Revision-Date: 2014-02-13 16:20+0000\n" "Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 13 Feb '14

13 Feb '14

commit 8491bcb96577c42977e9225684f4e2d4820d5d3f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 13 16:45:08 2014 +0000 Update translations for tsum --- ko/short-user-manual_ko_noimg.xhtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ko/short-user-manual_ko_noimg.xhtml b/ko/short-user-manual_ko_noimg.xhtml index cc4d71f..dcc0d45 100644 --- a/ko/short-user-manual_ko_noimg.xhtml +++ b/ko/short-user-manual_ko_noimg.xhtml @@ -63,7 +63,7 @@ sub 2048R/EB399FD7 2003-10-16 <p> <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em> </p> - <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3> + <h3 id="what-to-do-when-tor-does-not-connect">Tor가 연결 되지 않을 때 대처법</h3> <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p> <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p> <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p> @@ -88,8 +88,8 @@ sub 2048R/EB399FD7 2003-10-16 <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> </ol> - <h2 id="frequently-asked-questions">Frequently Asked Questions</h2> - <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p> + <h2 id="frequently-asked-questions">자주 묻는 질문들</h2> + <p>여기서는 가장 일반적인 몇 가지 질문에 답변합니다. 귀하의 질문이 여기에 언급되지 않은 경우, help(a)rt.torproject.xn--org-568n 이메일을 보내주시기 바랍니다.</p> <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3> <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p> <p>If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions:</p> @@ -119,14 +119,14 @@ sub 2048R/EB399FD7 2003-10-16 <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p> <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p> <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p> - <h3 id="flash-does-not-work">Flash does not work</h3> + <h3 id="flash-does-not-work">Flash가 맛 갔어요</h3> <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p> <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p> <p>Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle.</p> - <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p> - <h3 id="i-want-to-use-another-browser">I want to use another browser</h3> + <p>자세한 정보는 다음 주소를 참조하십시오. <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a></p> + <h3 id="i-want-to-use-another-browser">전 다른 브라우저 쓰고 싶은데요.</h3> <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p> - <h3 id="why-tor-is-slow">Why Tor is slow</h3> - <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p> + <h3 id="why-tor-is-slow">왜 Tor는 이렇게 느려터진 겁니까?</h3> + <p>Tor는 정상적인 인터넷 연결보다 약간 느려질 수 있습니다. Tor의 트래픽은 여러 나라를 통해 전송되기 때문입니다. 구조상 여러 단계를 거쳐야 검열을 피할 수 있기 때문입니다. 때문에 Tor를 통한 P2P 공유는 자제해 주십시오. Tor는 전세계에 퍼져있는 참여자들이 자원봉사 차원으로, 그것도 인터넷 검열이 심한 국가의 시민들을 위해 제공하는 트래픽이기 때문입니다.</p> </body> </html>

1 0