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

[bridgedb/develop] Fix libgpgme signing error due to Python2.7 buffer() interface changes.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit 3debed96a8e04894b0064e8075ffd8c1dd4ce10b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 05:08:10 2014 +0000 Fix libgpgme signing error due to Python2.7 buffer() interface changes. See https://mail.python.org/pipermail/python-dev/2010-October/104917.html https://docs.python.org/2/c-api/buffer.html https://github.com/SoftwareIntrospectionLab/MininGit/issues/101#issuecommen… We have to test if our Python2.7 version has the new or old builtin buffer() interface. --- lib/bridgedb/crypto.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 4ce30b2..2feb556 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -61,6 +61,24 @@ from twisted.internet import ssl #: The hash digest to use for HMACs. DIGESTMOD = hashlib.sha1 +# Test to see if we have the old or new style buffer() interface. Trying +# to use an old-style buffer on Python2.7 prior to version 2.7.5 will produce: +# +# TypeError: 'buffer' does not have the buffer interface +# +#: ``True`` if we have the new-style +#: `buffer <https://docs.python.org/2/c-api/buffer.html>` interface. +NEW_BUFFER_INTERFACE = False +try: + io.BytesIO(buffer('test')) +except TypeError: + logging.warn( + "This Python version is too old! "\ + "It doesn't support new-style buffer interfaces: "\ + "https://mail.python.org/pipermail/python-dev/2010-October/104917.html") +else: + NEW_BUFFER_INTERFACE = True + class RSAKeyGenerationError(Exception): """Raised when there was an error creating an RSA keypair.""" @@ -395,8 +413,13 @@ def gpgSignMessage(gpgmeCtx, messageString, mode=None): if not mode: mode = gpgme.SIG_MODE_CLEAR - msgFile = io.BytesIO(buffer(messageString)) - sigFile = io.BytesIO() + if NEW_BUFFER_INTERFACE: + msgFile = io.BytesIO(buffer(messageString)) + sigFile = io.BytesIO() + else: + msgFile = io.StringIO(unicode(messageString)) + sigFile = io.StringIO() + sigList = gpgmeCtx.sign(msgFile, sigFile, mode) sigFile.seek(0) signature = sigFile.read()

1 0

[bridgedb/develop] PEP8 whitespace fixes on module docstring bridgedb.parse.versions.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit 77f5da56ed877b79a9420478f43003aa5309036d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 23:19:34 2014 +0000 PEP8 whitespace fixes on module docstring bridgedb.parse.versions. --- lib/bridgedb/parse/versions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index e71df97..1d05ae1 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -12,13 +12,14 @@ """Parsers for Tor version number strings. .. py:module:: bridgedb.parse.versions - :synopsis: Parsers for Tor version number strings. + :synopsis: Parsers for Tor version number strings. bridgedb.parse.versions ======================= :: - Version - Holds, parses, and does comparison operations for package version numbers. + Version - Holds, parses, and does comparison operations for package + version numbers. .. """

1 0

[bridgedb/develop] Merge branch 'hotfix/11522-gpg-signing' into develop
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit cbb078b63c844cf7f0ee9926f9c8f92367a01790 Merge: e1b5588 3debed9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 05:14:44 2014 +0000 Merge branch 'hotfix/11522-gpg-signing' into develop lib/bridgedb/crypto.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)

1 0

[bridgedb/develop] Rename Sphinx build source for bridgedb.util module to new module name.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit 47185024492dc33e240c5d9be25518a07f32c846 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 14:52:06 2014 +0000 Rename Sphinx build source for bridgedb.util module to new module name. --- doc/sphinx/source/bridgedb.Util.rst | 9 --------- doc/sphinx/source/bridgedb.util.rst | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/sphinx/source/bridgedb.Util.rst b/doc/sphinx/source/bridgedb.Util.rst deleted file mode 100644 index 63db16d..0000000 --- a/doc/sphinx/source/bridgedb.Util.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. _util: - -bridgedb.util -------------- - -.. automodule:: bridgedb.util - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.util.rst b/doc/sphinx/source/bridgedb.util.rst new file mode 100644 index 0000000..63db16d --- /dev/null +++ b/doc/sphinx/source/bridgedb.util.rst @@ -0,0 +1,9 @@ +.. _util: + +bridgedb.util +------------- + +.. automodule:: bridgedb.util + :members: + :undoc-members: + :show-inheritance:

1 0

[bridgedb/develop] Add file header and module docstring for bridgedb.parse.versions.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit a54a04c550ea7895f51ba59f5672ba81145a5cce Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:03:23 2014 +0000 Add file header and module docstring for bridgedb.parse.versions. --- lib/bridgedb/parse/versions.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 94d16b2..99944f4 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -1,4 +1,26 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_parse_versions ; -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2014 Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# :license: see included LICENSE for information +"""Parsers for Tor version number strings. + +.. py:module:: bridgedb.parse.versions + :synopsis: Parsers for Tor version number strings. + +bridgedb.parse.versions +======================= +:: + + Version - Holds, parses, and does comparison operations for package version numbers. +.. +""" from twisted.python import util as txutil

1 0

[bridgedb/develop] Fix type specifiers on b.p.versions.Version class attr docstrings.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit 27ad2ee9f4695c11ba25445c9ba31b87fb78f4da Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:04:04 2014 +0000 Fix type specifiers on b.p.versions.Version class attr docstrings. Also add more information on the potential attribute values. --- lib/bridgedb/parse/versions.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 99944f4..e5e4ab5 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -28,11 +28,16 @@ from twisted.python import util as txutil class Version(txutil.Version): """Holds, parses, and does comparison operations for version numbers. - :attr string major: The major version number. - :attr string minor: The minor version number. - :attr string micro: The micro version number. - :attr string prerelease: Sometime, another number, though often suffixed - with a `-`, `+`, or `#`. + :attr str package: The package name, if available. + :attr int major: The major version number. + :attr int minor: The minor version number. + :attr int micro: The micro version number. + :attr str prerelease: The **prerelease** specifier isn't always present, + though when it is, it's usually separated from the main + ``major.minor.micro`` part of the version string with a ``-``, ``+``, + or ``#`` character. Sometimes the **prerelease** is another number, + although often it can be a word specifying the release state, + i.e. ``+alpha``, ``-rc2``, etc. """ def __init__(self, version, package=None):

1 0

[bridgedb/develop] Add attribute docstring for crypto.gpgmeErrorTranslations.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit 2575fa53ccc444c9d755d28644353d2ff4ea56f1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 14:49:14 2014 +0000 Add attribute docstring for crypto.gpgmeErrorTranslations. --- lib/bridgedb/crypto.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 606bce2..434dd8a 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -279,6 +279,11 @@ def _createGPGMEErrorInterpreters(): return errorDict +#: This is a dictionary which holds a translation of GPGME ERRNOs ←→ all known +#: names/causes for that ERRNO, and vice versa. It is created automatically, +#: via the :func:`_createGPGMEErrorInterpreters` function, when this module is +#: loaded so that :exc:`LessCrypticGPGMEError` can use it to display +#: human-readable information about why GPGME borked itself on something. gpgmeErrorTranslations = _createGPGMEErrorInterpreters() def getGPGContext(cfg):

1 0

[bridgedb/develop] Add docstring for crypto._createGPGMEErrorInterpreters().
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit b8e8218e856ebfff94ab6fd1728ba67d54095066 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 14:48:39 2014 +0000 Add docstring for crypto._createGPGMEErrorInterpreters(). --- lib/bridgedb/crypto.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index cddc108..606bce2 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -243,6 +243,20 @@ def getHMACFunc(key, hex=True): return hmac_fn def _createGPGMEErrorInterpreters(): + """Create a mapping of GPGME ERRNOs ←→ human-readable error names/causes. + + This function is called automatically when :mod:`this module + <bridgedb.crypto>` is loaded. The resulting dictionary mapping is stored + as :attr:`~bridgedb.crypto.gpgmeErrorTranslations`, and is used by + :exc:`~bridgedb.crypto.LessCrypticGPGMEError`. + + :returns: A dict of:: + {str(ERRNO): [ERRORNAME, ANOTHER_ERRORNAME, …], + …, + str(ERRORNAME): str(ERRNO), + …} + for all known error numbers and error names/causes. + """ errorDict = {} errorAttrs = []

1 0

[bridgedb/develop] Raise an error rather than printing in b.p.v.Versions.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit ce4a13b50cd05f28c54a90a087809f87d835993b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:06:49 2014 +0000 Raise an error rather than printing in b.p.v.Versions. --- lib/bridgedb/parse/versions.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index b327cb8..0aefe43 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -25,6 +25,10 @@ bridgedb.parse.versions from twisted.python import util as txutil +class InvalidVersionStringFormat(ValueError): + """Raised when a version string is not in a parseable format.""" + + class Version(txutil.Version): """Holds, parses, and does comparison operations for version numbers. @@ -66,9 +70,8 @@ class Version(txutil.Version): version number for. """ if version.find('.') == -1: - print("Version.__init__(): %r doesn't look like a version string!" - % version.__repr__()) - + raise InvalidVersionStringFormat( + "Invalid delimiters in version string: %r" % version) major, minor, micro, prerelease = ['' for x in xrange(4)] components = version.split('.')

1 0

[bridgedb/develop] Change attr and fmtstr types in b.p.v.Version to be comparable.
by isis＠torproject.org 23 Apr '14

23 Apr '14

commit 1462ee5c8c0deb14321beac8a530d108ea22d051 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:14:50 2014 +0000 Change attr and fmtstr types in b.p.v.Version to be comparable. We should use ints for the `major`, `minor`, and `minor` attributes, just like the parent class in Twisted does. --- lib/bridgedb/parse/versions.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 0aefe43..e71df97 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -72,19 +72,21 @@ class Version(txutil.Version): if version.find('.') == -1: raise InvalidVersionStringFormat( "Invalid delimiters in version string: %r" % version) - major, minor, micro, prerelease = ['' for x in xrange(4)] + package = package if package is not None else str() + major, minor, micro = [int() for _ in range(3)] + prerelease = str() components = version.split('.') if len(components) > 0: try: - prerelease = components.pop() - micro = components.pop() - minor = components.pop() - major = components.pop() + prerelease = str(components.pop()) + micro = int(components.pop()) + minor = int(components.pop()) + major = int(components.pop()) except IndexError: pass super(Version, self).__init__(package, major, minor, micro, prerelease) - + def base(self): """Get the base version number (with prerelease). @@ -92,8 +94,8 @@ class Version(txutil.Version): :returns: A version number, without the package/program name, and with the prefix (if available). For example: '0.2.5.1-alpha'. """ - prerelease = getPrefixedPrerelease() - return '%d.%d.%d%s' % (self.major, self.minor, self.micro, prerelease) + pre = self.getPrefixedPrerelease() + return '%s.%s.%s%s' % (self.major, self.minor, self.micro, pre) def getPrefixedPrerelease(self, separator='.'): """Get the prerelease string, prefixed by the separator ``prefix``. @@ -105,11 +107,15 @@ class Version(txutil.Version): """ pre = '' if self.prerelease is not None: - pre = prefix + self.prerelease + pre = separator + self.prerelease return pre def __repr__(self): - prerelease = getPrefixedPrerelease('') - return '%s(package=%r, major=%d, minor=%d, micro=%d, prerelease=%s)' \ - % (self.__class__.__name__, str(self.package), - self.major, self.minor, self.micro, self.prerelease) + prerelease = self.getPrefixedPrerelease('') + return '%s(package=%s, major=%s, minor=%s, micro=%s, prerelease=%s)' \ + % (str(self.__class__.__name__), + str(self.package), + str(self.major), + str(self.minor), + str(self.micro), + str(prerelease))

1 0