September 2017 - tor-commits - lists.torproject.org

[tor/master] Update CodingStandards.md for changes-file stuff
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 2032d7ca6f0d082c3774c922944feb7d73c8a851 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 16:39:49 2017 -0400 Update CodingStandards.md for changes-file stuff 'check-changes' is now part of "make check", and must pass. --- doc/HACKING/CodingStandards.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md index 1012a4c9c..2980b775f 100644 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@ -96,17 +96,14 @@ you can use `git describe --contains <sha1 of commit>`. If at all possible, try to create this file in the same commit where you are making the change. Please give it a distinctive name that no other branch will use for the lifetime of your change. To verify the format of the changes file, -you can use `make check-changes`. +you can use `make check-changes`. This is run automatically as part of +`make check` -- if it fails, we must fix it before we release. These +checks are implemented in `scripts/maint/lintChanges.py`. When we go to make a release, we will concatenate all the entries in changes to make a draft changelog, and clear the directory. We'll then edit the draft changelog into a nice readable format. -To make sure that stuff is in the right format, we use -scripts/maint/lintChanges.py to check the changes files for -(superficial) validity. You can run this script on your own changes -files! - What needs a changes file? * A not-exhaustive list: Anything that might change user-visible

1 0

[tor/master] Whoops -- put a changes file in the wrong place :(
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit c3f126f7533930c848d7ab291662bb20d04cfb0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 16:29:15 2017 -0400 Whoops -- put a changes file in the wrong place :( --- ticket23564 => changes/ticket23564 | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ticket23564 b/changes/ticket23564 similarity index 100% rename from ticket23564 rename to changes/ticket23564

1 0

[tor/master] Fix warning in bug23610
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit f118c0216bf14e9c35fda732a059b7879f9384fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 16:27:09 2017 -0400 Fix warning in bug23610 --- changes/bug23610 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 index 20852a698..271bf2b45 100644 --- a/changes/bug23610 +++ b/changes/bug23610 @@ -1,5 +1,5 @@ o Minor bugfixes (hidden service, relay): - Avoid a possible double close of a circuit by the intro point on error - of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + of sending the INTRO_ESTABLISHED cell. Fixes bug 23610; bugfix on 0.3.0.1-alpha.

1 0

[tor/master] Merge branch 'ticket23564_squashed'
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 68df19049b01fca0fc88bf86cd3e3bd7627431a8 Merge: b2f3b3b7e 3c04c8317 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 16:25:30 2017 -0400 Merge branch 'ticket23564_squashed' Makefile.am | 4 +-- scripts/maint/lintChanges.py | 62 ++++++++++++++++++++++++++++++++------------ ticket23564 | 4 +++ 3 files changed, 52 insertions(+), 18 deletions(-)

1 0

[tor/master] Make check-spaces part of the standard "make check" process
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 3c04c8317fc98aa64f9be18042a7255842e951c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 19 10:10:38 2017 -0400 Make check-spaces part of the standard "make check" process To do this, we had to make sure it passes when the changes directory is empty. I also tried to improve the quality of the output, and fix some false-positive cases. Let's see how this goes! Closes ticket 23564. --- Makefile.am | 4 +-- scripts/maint/lintChanges.py | 62 ++++++++++++++++++++++++++++++++------------ ticket23564 | 4 +++ 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3982f1e8a..7c454f79c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,7 @@ doxygen: test: all $(top_builddir)/src/test/test -check-local: check-spaces +check-local: check-spaces check-changes need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ @@ -217,7 +217,7 @@ check-logs: .PHONY: check-changes check-changes: @if test -d "$(top_srcdir)/changes"; then \ - $(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes/*; \ + $(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes; \ fi .PHONY: update-versions diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py index bf06064fa..b418065ff 100755 --- a/scripts/maint/lintChanges.py +++ b/scripts/maint/lintChanges.py @@ -20,8 +20,19 @@ KNOWN_GROUPS = set([ "Testing", "Documentation", "Code simplification and refactoring", - "Removed features"]) + "Removed features", + "Deprecated features"]) +NEEDS_SUBCATEGORIES = set([ + "Minor bugfix", + "Minor bugfixes", + "Major bugfix", + "Major bugfixes", + "Minor feature", + "Minor features", + "Major feature", + "Major features", + ]) def lintfile(fname): have_warned = [] @@ -46,13 +57,11 @@ def lintfile(fname): m = re.match(r'^[ ]{2}o ([^\(:]*)([^:]*):', contents) if not m: - warn("header not in format expected") + warn("Header not in format expected. (' o Foo:' or ' o Foo (Bar):')") elif m.group(1).strip() not in KNOWN_GROUPS: - warn("Weird header: %r" % m.group(1)) - elif (("bugfix" in m.group(1) or "feature" in m.group(1)) and - ("Removed" not in m.group(1)) and - '(' not in m.group(2)): - warn("Missing subcategory on %s" % m.group(1)) + warn("Unrecognized header: %r" % m.group(1)) + elif (m.group(1) in NEEDS_SUBCATEGORIES and '(' not in m.group(2)): + warn("Missing subcategory on %r" % m.group(1)) if m: isBug = ("bug" in m.group(1).lower() or "fix" in m.group(1).lower()) @@ -62,25 +71,46 @@ def lintfile(fname): contents = " ".join(contents.split()) if re.search(r'\#\d{2,}', contents): - warn("don't use a # before ticket numbers") + warn("Don't use a # before ticket numbers. ('bug 1234' not '#1234')") if isBug and not re.search(r'(\d+)', contents): - warn("bugfix does not mention a number") + warn("Ticket marked as bugfix, but does not mention a number.") elif isBug and not re.search(r'Fixes ([a-z ]*)bug (\d+)', contents): - warn("bugfix does not say 'Fixes bug XXX'") + warn("Ticket marked as bugfix, but does not say 'Fixes bug XXX'") if re.search(r'[bB]ug (\d+)', contents): if not re.search(r'[Bb]ugfix on ', contents): - warn("bugfix does not say 'bugfix on X.Y.Z'") + warn("Bugfix does not say 'bugfix on X.Y.Z'") elif not re.search('[fF]ixes ([a-z ]*)bug (\d+); bugfix on ', contents): - warn("bugfix incant is not semicoloned") + warn("Bugfix does not say 'Fixes bug X; bugfix on Y'") elif re.search('tor-([0-9]+)', contents): - warn("do not prefix versions with 'tor-'") - + warn("Do not prefix versions with 'tor-'. ('0.1.2', not 'tor-0.1.2'.)") + + return have_warned != [] + +def files(args): + """Walk through the arguments: for directories, yield their contents; + for files, just yield the files. Only search one level deep, because + that's how the changes directory is laid out.""" + for f in args: + if os.path.isdir(f): + for item in os.listdir(f): + if item.startswith("."): #ignore dotfiles + continue + yield os.path.join(f, item) + else: + yield f if __name__ == '__main__': - for fname in sys.argv[1:]: + problems = 0 + for fname in files(sys.argv[1:]): if fname.endswith("~"): continue - lintfile(fname) + if lintfile(fname): + problems += 1 + + if problems: + sys.exit(1) + else: + sys.exit(0) diff --git a/ticket23564 b/ticket23564 new file mode 100644 index 000000000..c493caf35 --- /dev/null +++ b/ticket23564 @@ -0,0 +1,4 @@ + o Minor features (build): + - The "check-changes" feature is now part of the "make check" + tests; we'll use it to try to prevent misformed changes files + from accumulating. Closes ticket 23564.

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit a6a0916bbd5763d7e83eece1bda6994012b8273a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 20:15:26 2017 +0000 Update translations for whisperback_completed --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 701904a14..fc0482460 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 11:44+0000\n" +"PO-Revision-Date: 2017-09-21 19:45+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit 2605b662b4b2665f6f88deceb8650656b5efd918 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 20:15:20 2017 +0000 Update translations for whisperback --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 701904a14..fc0482460 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 11:44+0000\n" +"PO-Revision-Date: 2017-09-21 19:45+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[stem/master] Support multiple extra entries on versions
by atagar＠torproject.org 21 Sep '17

21 Sep '17

commit bac3947224b96b5bba98f5e1a5e12ad6acc20a96 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 21 12:23:19 2017 -0700 Support multiple extra entries on versions https://trac.torproject.org/projects/tor/ticket/22110 https://gitweb.torproject.org/torspec.git/commit/?id=b50917d --- docs/change_log.rst | 1 + stem/version.py | 29 +++++++++++++++++------------ test/unit/version.py | 11 +++++++++++ 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 2e421c4f..415a8bfe 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -62,6 +62,7 @@ The following are only available within Stem's `git repository * Added :func:`~stem.manual.database` to get a cursor for the manual cache * Failed to parse torrcs without a port on ipv6 exit policy entries * Resilient to 'Tor' prefix in 'GETINFO version' result (:spec:`c5ff1b1`) + * Added a **all_extra** parameter to :class:`stem.version.Version` and support for multiple parenthetical entries (:trac:`22110`, :spec:`b50917d`) * Closing controller connection faster when under heavy event load * More succinct trace level logging diff --git a/stem/version.py b/stem/version.py index 4f0ffb9c..87070093 100644 --- a/stem/version.py +++ b/stem/version.py @@ -94,6 +94,8 @@ except ImportError: # cache for the get_system_tor_version function VERSION_CACHE = {} +VERSION_PATTERN = re.compile(r'^([0-9]+)\.([0-9]+)\.([0-9]+)(\.[0-9]+)?(-\S*)?(( $\S*$)*)$') + def get_system_tor_version(tor_cmd = 'tor'): """ @@ -156,13 +158,17 @@ class Version(object): <https://gitweb.torproject.org/torspec.git/tree/version-spec.txt>`_, such as "0.1.4" or "0.2.2.23-alpha (git-7dcd105be34a4f44)". + .. versionchanged:: 1.6.0 + Added all_extra parameter.. + :var int major: major version :var int minor: minor version :var int micro: micro version :var int patch: patch level (**None** if undefined) :var str status: status tag such as 'alpha' or 'beta-dev' (**None** if undefined) - :var str extra: extra information without its parentheses such as + :var str extra: first extra information without its parentheses such as 'git-8be6058d8f31e578' (**None** if undefined) + :var list all_extra: all extra information entries, without their parentheses :var str git_commit: git commit id (**None** if it wasn't provided) :param str version_str: version to be parsed @@ -172,11 +178,11 @@ class Version(object): def __init__(self, version_str): self.version_str = version_str - version_parts = re.match(r'^([0-9]+)\.([0-9]+)\.([0-9]+)(\.[0-9]+)?(-\S*)?( $\S*$)?$', version_str) + version_parts = VERSION_PATTERN.match(version_str) self._hash = None if version_parts: - major, minor, micro, patch, status, extra = version_parts.groups() + major, minor, micro, patch, status, extra_str, _ = version_parts.groups() # The patch and status matches are optional (may be None) and have an extra # proceeding period or dash if they exist. Stripping those off. @@ -187,20 +193,19 @@ class Version(object): if status: status = status[1:] - if extra: - extra = extra[2:-1] - self.major = int(major) self.minor = int(minor) self.micro = int(micro) self.patch = patch self.status = status - self.extra = extra - - if extra and re.match('^git-[0-9a-f]{16}$', extra): - self.git_commit = extra[4:] - else: - self.git_commit = None + self.all_extra = [entry[1:-1] for entry in extra_str.strip().split()] if extra_str else [] + self.extra = self.all_extra[0] if self.all_extra else None + self.git_commit = None + + for extra in self.all_extra: + if extra and re.match('^git-[0-9a-f]{16}$', extra): + self.git_commit = extra[4:] + break else: raise ValueError("'%s' isn't a properly formatted tor version" % version_str) diff --git a/test/unit/version.py b/test/unit/version.py index 2518a41b..f8c51f95 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -81,6 +81,16 @@ class TestVersion(unittest.TestCase): self.assertRaises(ValueError, stem.version.Version, '12.3') self.assertRaises(ValueError, stem.version.Version, '1.-2.3') + def test_with_multiple_extra(self): + """ + Parse a version with multiple 'extra' fields. + """ + + version = Version('0.1.2 (release) (git-73ff13ab3cc9570d)') + self.assert_versions_match(version, 0, 1, 2, None, None, 'release') + self.assertEqual(['release', 'git-73ff13ab3cc9570d'], version.all_extra) + self.assertEqual('73ff13ab3cc9570d', version.git_commit) + def test_comparison(self): """ Tests comparision between Version instances. @@ -224,6 +234,7 @@ class TestVersion(unittest.TestCase): self.assertEqual(extra, version.extra) if extra is None: + self.assertEqual([], version.all_extra) self.assertEqual(None, version.git_commit) def assert_version_is_greater(self, first_version, second_version):

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit a4b42b71d4ee3b3a72c7298decd446fec0010746 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 19:17:45 2017 +0000 Update translations for tor-and-https --- ku_IQ.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ku_IQ.po b/ku_IQ.po index ee6d6237f..9761ea91e 100644 --- a/ku_IQ.po +++ b/ku_IQ.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2016-09-16 19:31+0000\n" +"PO-Revision-Date: 2017-09-21 19:02+0000\n" "Last-Translator: Rasti K5 <rasti.khdhr(a)gmail.com>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/otf/torproject/language/ku_IQ/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit 476cfe854c19254bc7b6dd3c89aab3fd4f4068fb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 19:17:37 2017 +0000 Update translations for tails-perl5lib --- ku_IQ.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ku_IQ.po b/ku_IQ.po index 7fa2cc05d..4262f6f70 100644 --- a/ku_IQ.po +++ b/ku_IQ.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-25 16:59+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"POT-Creation-Date: 2017-05-20 10:59+0200\n" +"PO-Revision-Date: 2017-09-21 19:02+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/otf/torproject/language/ku_IQ/)\n" "MIME-Version: 1.0\n"

1 0