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

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 02 Jan '14

02 Jan '14

commit 4d10599fb6feb5adc7c8c290351d6da452646bd1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 2 17:15:17 2014 +0000 Update translations for vidalia_alpha --- fr_CA/vidalia_fr_CA.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr_CA/vidalia_fr_CA.po b/fr_CA/vidalia_fr_CA.po index 2a2d959..d3f0ebb 100644 --- a/fr_CA/vidalia_fr_CA.po +++ b/fr_CA/vidalia_fr_CA.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2014-01-02 08:41+0000\n" +"PO-Revision-Date: 2014-01-02 17:00+0000\n" "Last-Translator: Phoul <colin(a)torproject.org>\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -122,7 +122,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "AdvancedPage" msgid "Data Directory" @@ -1396,7 +1396,7 @@ msgstr "" msgctxt "GeneralPage" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "GeneralPage" msgid "Tor" @@ -2340,7 +2340,7 @@ msgstr "" msgctxt "MessageLog" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "MessageLog" msgid "Enable automatically saving all new log messages to a file" @@ -3826,7 +3826,7 @@ msgstr "Quitter" msgctxt "VMessageBox" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "Vidalia" msgid "Invalid Argument"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Jan '14

02 Jan '14

commit 834a633419cd9478d27fc690d26aeecf97c3a760 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 2 17:15:13 2014 +0000 Update translations for vidalia --- fr_CA/vidalia_fr_CA.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr_CA/vidalia_fr_CA.po b/fr_CA/vidalia_fr_CA.po index e848ca8..7812551 100644 --- a/fr_CA/vidalia_fr_CA.po +++ b/fr_CA/vidalia_fr_CA.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2014-01-02 08:41+0000\n" +"PO-Revision-Date: 2014-01-02 17:00+0000\n" "Last-Translator: Phoul <colin(a)torproject.org>\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -122,7 +122,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "AdvancedPage" msgid "Data Directory" @@ -1352,7 +1352,7 @@ msgstr "" msgctxt "GeneralPage" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "GeneralPage" msgid "Start the Tor software when Vidalia starts" @@ -2381,7 +2381,7 @@ msgstr "" msgctxt "MessageLog" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "MessageLog" msgid "Enable automatically saving all new log messages to a file" @@ -3739,7 +3739,7 @@ msgstr "Quitter" msgctxt "VMessageBox" msgid "Browse" -msgstr "" +msgstr "Parcourir" msgctxt "Vidalia" msgid "Invalid Argument"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 02 Jan '14

02 Jan '14

commit cf9158585d945a31a7ace60dc292233cfa08eaf2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 2 17:15:06 2014 +0000 Update translations for orbot --- values-fr_CA/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/values-fr_CA/strings.xml b/values-fr_CA/strings.xml index 8adf3ea..024b8c2 100644 --- a/values-fr_CA/strings.xml +++ b/values-fr_CA/strings.xml @@ -1,5 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> + <string name="menu_browse">Parcourir</string> <string name="menu_info">Aide</string> <string name="menu_start">Démarrer</string> <string name="menu_about">À propos</string>

1 0

[arm/master] Use pyflakes and pep8 apis rather than shelling out
by atagar＠torproject.org 02 Jan '14

02 Jan '14

commit be09186f744d9fd335fb354d957e5e766e847709 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 2 08:29:15 2014 -0800 Use pyflakes and pep8 apis rather than shelling out Bringing over stem's recent improvements to use pyflakes and pep8 directly rather than shelling out. This results in a 62.7% reduction in our test runtime (from 2.63 to 0.98 seconds on my system). --- arm/headerPanel.py | 4 +- run_tests.py | 138 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 88 insertions(+), 54 deletions(-) diff --git a/arm/headerPanel.py b/arm/headerPanel.py index addde9d..00796a1 100644 --- a/arm/headerPanel.py +++ b/arm/headerPanel.py @@ -21,8 +21,6 @@ import threading import arm.util.tracker -import stem - from stem.control import State from stem.util import conf, log, str_tools @@ -173,6 +171,8 @@ class HeaderPanel(panel.Panel, threading.Thread): # torTools.getConn().init(controller) # log.notice("Reconnected to Tor's control port") # arm.popups.showMsg("Tor reconnected", 1) + + pass else: isKeystrokeConsumed = False return isKeystrokeConsumed diff --git a/run_tests.py b/run_tests.py index 3ed5e25..13570bc 100755 --- a/run_tests.py +++ b/run_tests.py @@ -79,6 +79,34 @@ def clean_orphaned_pyc(): 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 @@ -94,26 +122,25 @@ def get_stylistic_issues(paths): :returns: **dict** of the form ``path => [(line_number, message)...]`` """ - ignored_issues = ','.join(CONFIG["pep8.ignore"]) issues = {} - for path in paths: - pep8_output = stem.util.system.call( - "pep8 --ignore %s %s" % (ignored_issues, path), - ignore_exit_status = True, - ) + if is_pep8_available(): + import pep8 - for line in pep8_output: - line_match = re.match("^(.*):(\d+):(\d+): (.*)$", line) + class StyleReport(pep8.BaseReport): + def __init__(self, options): + super(StyleReport, self).__init__(options) - if line_match: - path, line, _, issue = line_match.groups() + def error(self, line_number, offset, text, check): + code = super(StyleReport, self).error(line_number, offset, text, check) - if path in CONFIG["pep8.blacklist"]: - continue + if code: + issues.setdefault(self.filename, []).append((offset + line_number, "%s %s" % (code, text))) - issues.setdefault(path, []).append((int(line), issue)) + style_checker = pep8.StyleGuide(ignore = CONFIG["pep8.ignore"], reporter = StyleReport) + style_checker.check_files(filter(lambda path: path not in CONFIG["pep8.blacklist"], _python_files(paths))) + for path in paths: for file_path in _get_files_with_suffix(path): if file_path in CONFIG["pep8.blacklist"]: continue @@ -121,21 +148,25 @@ def get_stylistic_issues(paths): with open(file_path) as f: file_contents = f.read() - lines, file_issues, prev_indent = file_contents.split("\n"), [], 0 + 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: - file_issues.append((index + 1, "indentation has a tab")) + issues.setdefault(file_path, []).append((index + 1, "indentation has a tab")) elif "\r" in content: - file_issues.append((index + 1, "contains a windows newline")) + issues.setdefault(file_path, []).append((index + 1, "contains a windows newline")) elif content != content.rstrip(): - file_issues.append((index + 1, "line has trailing whitespace")) + issues.setdefault(file_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... # @@ -145,10 +176,7 @@ def get_stylistic_issues(paths): # The former is the old method and no longer supported in python 3 # going forward. - file_issues.append((index + 1, "except clause should use 'as', not comma")) - - if file_issues: - issues[file_path] = file_issues + issues.setdefault(file_path, []).append((index + 1, "except clause should use 'as', not comma")) return issues @@ -162,47 +190,47 @@ def get_pyflakes_issues(paths): :returns: dict of the form ``path => [(line_number, message)...]`` """ - pyflakes_ignore = {} + issues = {} - for line in CONFIG["pyflakes.ignore"]: - path, issue = line.split("=>") - pyflakes_ignore.setdefault(path.strip(), []).append(issue.strip()) + if is_pyflakes_available(): + import pyflakes.api + import pyflakes.reporter - def is_ignored(path, issue): - # Paths in pyflakes_ignore are relative, so we need to check to see if our - # path ends with any of them. + class Reporter(pyflakes.reporter.Reporter): + def __init__(self): + self._ignored_issues = {} - for ignore_path in pyflakes_ignore: - if path.endswith(ignore_path) and issue in pyflakes_ignore[ignore_path]: - return True + for line in CONFIG["pyflakes.ignore"]: + path, issue = line.split("=>") + self._ignored_issues.setdefault(path.strip(), []).append(issue.strip()) - return False + def unexpectedError(self, filename, msg): + self._register_issue(filename, None, msg) - # Pyflakes issues are of the form... - # - # FILE:LINE: ISSUE - # - # ... for instance... - # - # stem/prereq.py:73: 'long_to_bytes' imported but unused - # stem/control.py:957: undefined name 'entry' + def syntaxError(self, filename, msg, lineno, offset, text): + self._register_issue(filename, lineno, msg) - issues = {} + def flake(self, msg): + self._register_issue(msg.filename, msg.lineno, msg.message % msg.message_args) - for path in paths: - pyflakes_output = stem.util.system.call( - "pyflakes %s" % path, - ignore_exit_status = True, - ) + 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 - for line in pyflakes_output: - line_match = re.match("^(.*):(\d+): (.*)$", line) + return False - if line_match: - path, line, issue = line_match.groups() + def _register_issue(self, path, line_number, issue): + if not self._is_ignored(path, issue): + issues.setdefault(path, []).append((line_number, issue)) - if not is_ignored(path, issue): - issues.setdefault(path, []).append((int(line), issue)) + reporter = Reporter() + + for path in _python_files(paths): + pyflakes.api.checkPath(path, reporter) return issues @@ -228,5 +256,11 @@ def _get_files_with_suffix(base_path, suffix = ".py"): yield os.path.join(root, filename) +def _python_files(paths): + for path in paths: + for file_path in _get_files_with_suffix(path): + yield file_path + + if __name__ == '__main__': main()

1 0

[arm/master] Including run_tests.py among our static checks
by atagar＠torproject.org 02 Jan '14

02 Jan '14

commit f31be2db56bec8284d7b91a36bca7a8d61242904 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 2 08:43:01 2014 -0800 Including run_tests.py among our static checks Oops, also including our run_tests.py when running pyflakes and pep8. --- run_tests.py | 6 +++--- test/settings.cfg | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 13570bc..db7fd1d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -12,7 +12,6 @@ import re import unittest import stem.util.conf -import stem.util.system from arm.util import load_settings @@ -27,6 +26,7 @@ ARM_BASE = os.path.dirname(__file__) SRC_PATHS = [os.path.join(ARM_BASE, path) for path in ( 'arm', 'test', + 'run_tests.py', )] @@ -46,10 +46,10 @@ def main(): static_check_issues = {} - if stem.util.system.is_available("pyflakes"): + if is_pyflakes_available(): static_check_issues.update(get_pyflakes_issues(SRC_PATHS)) - if stem.util.system.is_available("pep8"): + if is_pep8_available(): static_check_issues.update(get_stylistic_issues(SRC_PATHS)) if static_check_issues: diff --git a/test/settings.cfg b/test/settings.cfg index 169a016..e3b3b75 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -50,4 +50,6 @@ pep8.blacklist ./arm/torrcPanel.py pyflakes.ignore arm/prereq.py => 'stem' imported but unused pyflakes.ignore arm/prereq.py => 'curses' imported but unused +pyflakes.ignore run_tests.py => 'pyflakes' imported but unused +pyflakes.ignore run_tests.py => 'pep8' imported but unused

1 0

[arm/master] Using stem's files_with_suffix()
by atagar＠torproject.org 02 Jan '14

02 Jan '14

commit 1518e114877adeb739e9c4ca7473e566b16acd44 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 2 09:04:34 2014 -0800 Using stem's files_with_suffix() Taking advantage of our system module's new helper. --- run_tests.py | 97 +++++++++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 59 deletions(-) diff --git a/run_tests.py b/run_tests.py index db7fd1d..324ed02 100755 --- a/run_tests.py +++ b/run_tests.py @@ -12,6 +12,7 @@ import re import unittest import stem.util.conf +import stem.util.system from arm.util import load_settings @@ -140,43 +141,42 @@ def get_stylistic_issues(paths): style_checker = pep8.StyleGuide(ignore = CONFIG["pep8.ignore"], reporter = StyleReport) style_checker.check_files(filter(lambda path: path not in CONFIG["pep8.blacklist"], _python_files(paths))) - for path in paths: - for file_path in _get_files_with_suffix(path): - if file_path in CONFIG["pep8.blacklist"]: - continue - - with open(file_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(file_path, []).append((index + 1, "indentation has a tab")) - elif "\r" in content: - issues.setdefault(file_path, []).append((index + 1, "contains a windows newline")) - elif content != content.rstrip(): - issues.setdefault(file_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(file_path, []).append((index + 1, "except clause should use 'as', not comma")) + for path in _python_files(paths): + if path in CONFIG["pep8.blacklist"]: + continue + + 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 @@ -235,30 +235,9 @@ def get_pyflakes_issues(paths): return issues -def _get_files_with_suffix(base_path, suffix = ".py"): - """ - Iterates over files in a given directory, providing filenames with a certain - suffix. - - :param str base_path: directory to be iterated over - :param str suffix: filename suffix to look for - - :returns: iterator that yields the absolute path for files with the given suffix - """ - - if os.path.isfile(base_path): - if base_path.endswith(suffix): - yield base_path - else: - for root, _, files in os.walk(base_path): - for filename in files: - if filename.endswith(suffix): - yield os.path.join(root, filename) - - def _python_files(paths): for path in paths: - for file_path in _get_files_with_suffix(path): + for file_path in stem.util.system.files_with_suffix(path, '.py'): yield file_path

1 0

[stem/master] Moving files_with_suffix() to system util
by atagar＠torproject.org 02 Jan '14

02 Jan '14

commit 5a9e5fe8a41236588f339b80499c2bc96997f24d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 2 08:51:46 2014 -0800 Moving files_with_suffix() to system util Our system module already has path manipulation helpers like expand_path() so probably a better home for files_with_suffix(). --- docs/change_log.rst | 4 ++++ stem/util/system.py | 24 ++++++++++++++++++++++++ test/unit/doctest.py | 3 ++- test/util.py | 41 ++++++++--------------------------------- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 7b71c47..352d4a8 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,10 @@ The following are only available within stem's `git repository * Added `support for CELL_STATS events <api/response.html#stem.response.events.CellStatsEvent>`_ (:spec:`6f2919a`) * Added `support for TB_EMPTY events <api/response.html#stem.response.events.TokenBucketEmptyEvent>`_ (:spec:`6f2919a`) + * **Utilities** + + * Added :func:`stem.util.system.files_with_suffix` + .. _version_1.1: Version 1.1 diff --git a/stem/util/system.py b/stem/util/system.py index db0943e..9b28e04 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -26,6 +26,7 @@ best-effort, providing **None** if the lookup fails. get_bsd_jail_id - provides the BSD jail id a given process is running within get_bsd_jail_path - provides the path of the given BSD jail expand_path - expands relative paths and ~ entries + files_with_suffix - provides files with the given suffix call - runs the given system command and provides back the results get_process_name - provides our process' name @@ -807,6 +808,29 @@ def expand_path(path, cwd = None): return relative_path +def files_with_suffix(base_path, suffix): + """ + Iterates over files in a given directory, providing filenames with a certain + suffix. + + .. versionadded:: 1.2.0 + + :param str base_path: directory to be iterated over + :param str suffix: filename suffix to look for + + :returns: iterator that yields the absolute path for files with the given suffix + """ + + if os.path.isfile(base_path): + if base_path.endswith(suffix): + yield base_path + else: + for root, _, files in os.walk(base_path): + for filename in files: + if filename.endswith(suffix): + yield os.path.join(root, filename) + + def call(command, default = UNDEFINED, ignore_exit_status = False): """ Issues a command in a subprocess, blocking until completion and returning the diff --git a/test/unit/doctest.py b/test/unit/doctest.py index ac9f430..1906480 100644 --- a/test/unit/doctest.py +++ b/test/unit/doctest.py @@ -11,6 +11,7 @@ import unittest import stem.descriptor.router_status_entry import stem.util.connection import stem.util.str_tools +import stem.util.system import stem.version import test.util @@ -32,7 +33,7 @@ class TestDocumentation(unittest.TestCase): stem_dir = os.path.join(test.util.STEM_BASE, 'stem') is_failed = False - for path in test.util._get_files_with_suffix(stem_dir): + for path in stem.util.system.files_with_suffix(stem_dir, '.py'): args = {'module_relative': False} test_run = None diff --git a/test/util.py b/test/util.py index ef323e7..6f54a91 100644 --- a/test/util.py +++ b/test/util.py @@ -276,10 +276,10 @@ def get_stylistic_issues(paths): 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(_get_python_files(paths)) + style_checker.check_files(list(_python_files(paths))) for path in paths: - for file_path in _get_files_with_suffix(path): + for file_path in stem.util.system.files_with_suffix(path, '.py'): if _is_test_data(file_path): continue @@ -367,7 +367,7 @@ def get_pyflakes_issues(paths): reporter = Reporter() - for path in _get_python_files(paths): + for path in _python_files(paths): pyflakes.api.checkPath(path, reporter) return issues @@ -437,7 +437,7 @@ def clean_orphaned_pyc(paths): orphaned_pyc = [] for path in paths: - for pyc_path in _get_files_with_suffix(path, ".pyc"): + 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. # @@ -471,7 +471,7 @@ def check_for_unused_tests(paths): unused_tests = [] for path in paths: - for py_path in _get_files_with_suffix(path, ".py"): + for py_path in stem.util.system.files_with_suffix(path, '.py'): if _is_test_data(py_path): continue @@ -544,27 +544,6 @@ def _is_test_data(path): return os.path.normpath(CONFIG["integ.test_directory"]) in path -def _get_files_with_suffix(base_path, suffix = ".py"): - """ - Iterates over files in a given directory, providing filenames with a certain - suffix. - - :param str base_path: directory to be iterated over - :param str suffix: filename suffix to look for - - :returns: iterator that yields the absolute path for files with the given suffix - """ - - if os.path.isfile(base_path): - if base_path.endswith(suffix): - yield base_path - else: - for root, _, files in os.walk(base_path): - for filename in files: - if filename.endswith(suffix): - yield os.path.join(root, filename) - - def run_tasks(category, *tasks): """ Runs a series of :class:`test.util.Task` instances. This simply prints 'done' @@ -587,15 +566,11 @@ def run_tasks(category, *tasks): println() -def _get_python_files(paths): - results = [] - +def _python_files(paths): for path in paths: - for file_path in _get_files_with_suffix(path): + for file_path in stem.util.system.files_with_suffix(path, '.py'): if not _is_test_data(file_path): - results.append(file_path) - - return results + yield file_path class Task(object):

1 0

[stem/master] Using _python_files() for custom style checks
by atagar＠torproject.org 02 Jan '14

02 Jan '14

commit 49bfd123ef9ee2706b797958b8b6b5eea75302d9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 2 08:56:13 2014 -0800 Using _python_files() for custom style checks Oops, we pretty much duplicated _python_files() for a bit of our checks. --- test/util.py | 70 +++++++++++++++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/test/util.py b/test/util.py index 6f54a91..295f883 100644 --- a/test/util.py +++ b/test/util.py @@ -278,43 +278,39 @@ def get_stylistic_issues(paths): style_checker = pep8.StyleGuide(ignore = CONFIG["pep8.ignore"], reporter = StyleReport) style_checker.check_files(list(_python_files(paths))) - for path in paths: - for file_path in stem.util.system.files_with_suffix(path, '.py'): - if _is_test_data(file_path): - continue - - with open(file_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(file_path, []).append((index + 1, "indentation has a tab")) - elif "\r" in content: - issues.setdefault(file_path, []).append((index + 1, "contains a windows newline")) - elif content != content.rstrip(): - issues.setdefault(file_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(file_path, []).append((index + 1, "except clause should use 'as', not comma")) + 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

1 0

[stem/master] Using pyflakes and pep8 apis
by atagar＠torproject.org 02 Jan '14

02 Jan '14

commit 4655b2e7594b8796daf25a1abc674a0761d5563a Merge: 5f8a2da 49bfd12 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 2 09:09:47 2014 -0800 Using pyflakes and pep8 apis Taking advantage of pyflakes and pep8 as python modules rather than shelling out, along with other general improvements for our static checks. This results in around a 60% reduction in the runtime for our static checks. docs/change_log.rst | 4 + docs/faq.rst | 6 +- run_tests.py | 28 ++++--- stem/util/system.py | 24 ++++++ test/settings.cfg | 7 +- test/unit/doctest.py | 3 +- test/util.py | 223 ++++++++++++++++++++++++-------------------------- 7 files changed, 156 insertions(+), 139 deletions(-)

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 02 Jan '14

02 Jan '14

commit 4534e0319ade9b993b0bb64b77b1a2d26c45bcb4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 2 16:46:26 2014 +0000 Update translations for torbutton-browserproperties_completed --- fr_CA/browser.properties | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/fr_CA/browser.properties b/fr_CA/browser.properties new file mode 100644 index 0000000..295a03a --- /dev/null +++ b/fr_CA/browser.properties @@ -0,0 +1,13 @@ +# Default home page +browser.startup.homepage=about:tor + +# Spell checker dictionary +spellchecker.dictionary=en_US + +# Default search engine +browser.search.defaultenginename=Startpage + +# Search engine order (order displayed in the search bar dropdown) +browser.search.order.1=Startpage +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google

1 0