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

[bridgedb/master] Update copyrights to 2015.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit c7292d86fde81a3d8f8cb7a8ad80dea4df3f061c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 24 01:39:20 2015 +0000 Update copyrights to 2015. --- lib/bridgedb/Bridges.py | 2 +- lib/bridgedb/Dist.py | 6 +++--- lib/bridgedb/HTTPServer.py | 4 ++-- lib/bridgedb/Main.py | 8 ++++---- lib/bridgedb/bridgerequest.py | 4 ++-- lib/bridgedb/bridges.py | 4 ++-- lib/bridgedb/captcha.py | 6 +++--- lib/bridgedb/configure.py | 8 ++++---- lib/bridgedb/crypto.py | 6 +++--- lib/bridgedb/email/autoresponder.py | 4 ++-- lib/bridgedb/email/dkim.py | 4 ++-- lib/bridgedb/email/request.py | 4 ++-- lib/bridgedb/email/server.py | 4 ++-- lib/bridgedb/email/templates.py | 4 ++-- lib/bridgedb/interfaces.py | 4 ++-- lib/bridgedb/parse/descriptors.py | 4 ++-- lib/bridgedb/parse/fingerprint.py | 4 ++-- lib/bridgedb/parse/nickname.py | 6 +++--- lib/bridgedb/parse/versions.py | 6 +++--- lib/bridgedb/runner.py | 5 +++-- lib/bridgedb/safelog.py | 4 ++-- lib/bridgedb/schedule.py | 4 ++-- lib/bridgedb/strings.py | 8 ++++++++ lib/bridgedb/test/deprecated.py | 6 +++--- lib/bridgedb/test/deprecated_networkstatus.py | 6 +++--- lib/bridgedb/test/test_Bucket.py | 4 ++-- lib/bridgedb/test/test_HTTPServer.py | 4 ++-- lib/bridgedb/test/test_bridgerequest.py | 4 ++-- lib/bridgedb/test/test_bridges.py | 4 ++-- lib/bridgedb/test/test_captcha.py | 4 ++-- lib/bridgedb/test/test_configure.py | 4 ++-- lib/bridgedb/test/test_crypto.py | 6 +++--- lib/bridgedb/test/test_https.py | 5 +++-- lib/bridgedb/test/test_parse_descriptors.py | 4 ++-- lib/bridgedb/test/test_parse_headers.py | 6 +++--- lib/bridgedb/test/test_parse_options.py | 4 ++-- lib/bridgedb/test/test_parse_versions.py | 4 ++-- lib/bridgedb/test/test_schedule.py | 4 ++-- lib/bridgedb/test/test_translations.py | 4 ++-- lib/bridgedb/test/test_txrecaptcha.py | 4 ++-- lib/bridgedb/test/test_util.py | 6 +++--- lib/bridgedb/translations.py | 4 ++-- lib/bridgedb/txrecaptcha.py | 4 ++-- lib/bridgedb/util.py | 6 +++--- 44 files changed, 110 insertions(+), 100 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index bdb911a..078cfff 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -3,7 +3,7 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """This module has low-level functionality for parsing bridges and arranging diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index df1ce5b..20f27bc 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -5,9 +5,9 @@ # :authors: Nick Mathewson # Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # Matthew Finkel 0x017DD169EA793BE2 <sysrqb(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """This module has functions to decide which bridges to hand out to whom.""" diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 258861e..ae86957 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see included AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information """ diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index d0698c0..45908c7 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -3,10 +3,10 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, Nick Mathewson -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, Nick Mathewson +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """This module sets up BridgeDB and starts the servers running.""" diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index 320074a..ff8e289 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 96f995e..86123b2 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Classes for manipulating and storing Bridges and their attributes.""" diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 758c1f3..234bbb4 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -7,9 +7,9 @@ # Aaron Gibson 0x2C4B239DD876C9F6 <aagbsn(a)torproject.org> # Nick Mathewson 0x21194EBB165733EA <nickm(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 55fcba5..90c5e2f 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -3,10 +3,10 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, Nick Mathewson -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, Nick Mathewson +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Utilities for dealing with configuration files for BridgeDB.""" diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index d6dbbad..7785073 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -3,9 +3,9 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """BridgeDB general cryptographic utilities. diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 726856c..80ad83d 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/dkim.py b/lib/bridgedb/email/dkim.py index d797dbc..d1075aa 100644 --- a/lib/bridgedb/email/dkim.py +++ b/lib/bridgedb/email/dkim.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/request.py b/lib/bridgedb/email/request.py index cd7b47d..9c0f0c2 100644 --- a/lib/bridgedb/email/request.py +++ b/lib/bridgedb/email/request.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 05cecb7..cde4637 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -7,8 +7,8 @@ # Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # Matthew Finkel <sysrqb(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/email/templates.py b/lib/bridgedb/email/templates.py index dda9f65..e81283e 100644 --- a/lib/bridgedb/email/templates.py +++ b/lib/bridgedb/email/templates.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2013-2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/interfaces.py b/lib/bridgedb/interfaces.py index b8a1e16..38c3541 100644 --- a/lib/bridgedb/interfaces.py +++ b/lib/bridgedb/interfaces.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index ea7bea8..efdedc9 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/parse/fingerprint.py b/lib/bridgedb/parse/fingerprint.py index 900fc06..f825271 100644 --- a/lib/bridgedb/parse/fingerprint.py +++ b/lib/bridgedb/parse/fingerprint.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/parse/nickname.py b/lib/bridgedb/parse/nickname.py index 8f4abea..35cf626 100644 --- a/lib/bridgedb/parse/nickname.py +++ b/lib/bridgedb/parse/nickname.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013 Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2013-2015 Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Parsers for bridge nicknames. diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 1d05ae1..8140357 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -4,9 +4,9 @@ # # :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 +# :copyright: (c) 2014-2015 Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: see included LICENSE for information """Parsers for Tor version number strings. diff --git a/lib/bridgedb/runner.py b/lib/bridgedb/runner.py index 9bc5d5b..7be7700 100644 --- a/lib/bridgedb/runner.py +++ b/lib/bridgedb/runner.py @@ -4,8 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file +# (c) 2012-2015, Isis Lovecruft # :license: 3-clause BSD, see included LICENSE for information """Classes for running components and servers, as well as daemonisation. diff --git a/lib/bridgedb/safelog.py b/lib/bridgedb/safelog.py index eb6810b..8130be6 100644 --- a/lib/bridgedb/safelog.py +++ b/lib/bridgedb/safelog.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Filters for log sanitisation. diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 71b4254..6757343 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -4,8 +4,8 @@ # # :authors: Nick Mathewson # Isis Lovecruft <isis(a)torproject.org> 0xa3adb67a2cdb8b35 -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information """This module implements functions for dividing time into chunks.""" diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index a9a06bc..5a9c528 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -1,4 +1,12 @@ # -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information from __future__ import unicode_literals diff --git a/lib/bridgedb/test/deprecated.py b/lib/bridgedb/test/deprecated.py index 0cf01fb..181814c 100644 --- a/lib/bridgedb/test/deprecated.py +++ b/lib/bridgedb/test/deprecated.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """deprecated ― functions and classes which have been removed from the diff --git a/lib/bridgedb/test/deprecated_networkstatus.py b/lib/bridgedb/test/deprecated_networkstatus.py index 7e3b0a4..41d8c5f 100644 --- a/lib/bridgedb/test/deprecated_networkstatus.py +++ b/lib/bridgedb/test/deprecated_networkstatus.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013 Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2013-2015 Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information """Parsers for bridge networkstatus descriptors. diff --git a/lib/bridgedb/test/test_Bucket.py b/lib/bridgedb/test/test_Bucket.py index fa3bb7e..a6e335f 100644 --- a/lib/bridgedb/test/test_Bucket.py +++ b/lib/bridgedb/test/test_Bucket.py @@ -2,8 +2,8 @@ # # This file is part of BridgeDB, a Tor bridge distribution system. # -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.Bucket` module. diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index fccbee8..ee6e588 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -4,8 +4,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2014, Isis Lovecruft -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2014-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_bridgerequest.py b/lib/bridgedb/test/test_bridgerequest.py index 24dcad2..b4da71b 100644 --- a/lib/bridgedb/test/test_bridgerequest.py +++ b/lib/bridgedb/test/test_bridgerequest.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index d42fb24..4388437 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -4,8 +4,8 @@ # # :authors: Isis Lovecruft <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.bridges` module.""" diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index a5083d7..1000477 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.captcha` module.""" diff --git a/lib/bridgedb/test/test_configure.py b/lib/bridgedb/test/test_configure.py index 501ed1f..ebac95a 100644 --- a/lib/bridgedb/test/test_configure.py +++ b/lib/bridgedb/test/test_configure.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: please see the AUTHORS file for attributions -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Tests for :mod:`bridgedb.configure`.""" diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index c2010ca..9fb0448 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for :mod:`bridgedb.crypto`.""" diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 92b07bf..1e0c778 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -3,8 +3,9 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: trygve <tor-dev(a)lists.torproject.org> -# :copyright: (c) trygve -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014, trygve +# (c) 2014-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 2336a24..aa3b662 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for :class:`bridgedb.parse.descriptors` module.""" diff --git a/lib/bridgedb/test/test_parse_headers.py b/lib/bridgedb/test/test_parse_headers.py index ddcf66f..278e721 100644 --- a/lib/bridgedb/test/test_parse_headers.py +++ b/lib/bridgedb/test/test_parse_headers.py @@ -4,9 +4,9 @@ # # :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 +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.parse.headers` module.""" diff --git a/lib/bridgedb/test/test_parse_options.py b/lib/bridgedb/test/test_parse_options.py index fc76904..c505c36 100644 --- a/lib/bridgedb/test/test_parse_options.py +++ b/lib/bridgedb/test/test_parse_options.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2014-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_parse_versions.py b/lib/bridgedb/test/test_parse_versions.py index 3b2e392..becdd20 100644 --- a/lib/bridgedb/test/test_parse_versions.py +++ b/lib/bridgedb/test/test_parse_versions.py @@ -5,8 +5,8 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2014, The Tor Project, Inc. -# (c) 2014, Isis Lovecruft +# :copyright: (c) 2014-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft # :license: see LICENSE for licensing information #_____________________________________________________________________________ diff --git a/lib/bridgedb/test/test_schedule.py b/lib/bridgedb/test/test_schedule.py index 178e3e4..d7fc9c1 100644 --- a/lib/bridgedb/test/test_schedule.py +++ b/lib/bridgedb/test/test_schedule.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2014, Isis Lovecruft -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2014-2015, The Tor Project, Inc. # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.schedule` module.""" diff --git a/lib/bridgedb/test/test_translations.py b/lib/bridgedb/test/test_translations.py index ee15ac4..442338a 100644 --- a/lib/bridgedb/test/test_translations.py +++ b/lib/bridgedb/test/test_translations.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2014, Isis Lovecruft -# (c) 2014, The Tor Project, Inc. +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2014-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information diff --git a/lib/bridgedb/test/test_txrecaptcha.py b/lib/bridgedb/test/test_txrecaptcha.py index 81484dc..4704d49 100644 --- a/lib/bridgedb/test/test_txrecaptcha.py +++ b/lib/bridgedb/test/test_txrecaptcha.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the bridgedb.txrecaptcha module.""" diff --git a/lib/bridgedb/test/test_util.py b/lib/bridgedb/test/test_util.py index 272c5b7..da4ddf4 100644 --- a/lib/bridgedb/test/test_util.py +++ b/lib/bridgedb/test/test_util.py @@ -4,9 +4,9 @@ # # :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 +# :copyright: (c) 2014-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: see LICENSE for licensing information """Unittests for the :mod:`bridgedb.util` module.""" diff --git a/lib/bridgedb/translations.py b/lib/bridgedb/translations.py index 3085938..2c9d56f 100644 --- a/lib/bridgedb/translations.py +++ b/lib/bridgedb/translations.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information import gettext diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 779e00e..477e112 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -3,8 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index ca2a88f..f3d87bd 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -4,9 +4,9 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # Matthew Finkel 0x017DD169EA793BE2 <sysrqb(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2013-2014, Matthew Finkel -# (c) 2007-2014, The Tor Project, Inc. +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2013-2015, Matthew Finkel +# (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Common utilities for BridgeDB."""

1 0

[bridgedb/master] Update CHANGELOG for bridgedb-0.3.1.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 217b918e72b0fbba261dc32dd3a2d58ec1cd5ab5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 24 00:50:33 2015 +0000 Update CHANGELOG for bridgedb-0.3.1. --- CHANGELOG | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d0f99e1..279ad57 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,44 @@ -Changes in version 0.3.0 - XXX +Changes in version 0.3.1 - 2015-03-24 + + * FIXES #14065 https://bugs.torproject.org/14065 + When requesting vanilla IPv6 bridges from + https://bridges.torproject.org, BridgeDB would respond with IPv4 + addresses. It now correctly responds with IPv6 addresses. + +And includes the following general changes: + + * FIXES an issue with the filtering of hashrings while answering + requests for Pluggable Transports. (commit 3ef37df6) + + * FIXES the return value from the GnuPG interface initialization + function (bridgedb.crypto.initializeGnuPG) when creating a test + signature has failed. + + * CHANGES the way BridgeDB handles the case where it parses to + duplicate extrainfo descriptors (for the same Bridge) which also + have identical timestamps. Before, we assumed this wasn't + possible. It turns out that it not only is possible, but that + usually every batch of descriptors has at least one Bridge with + such a set of perfectly identical extrainfo descriptors. Even + stranger, it appears that only Bridges started for the first time + quite recently (within the last eight hours) display this + behaviour. BridgeDB now logs these errors, rather than leaving + them unhandled. + (commit a27d7905) + + * ADDS an environment variable check to setup.py which controls + whether the setup.py script tries to install the dependencies + listed in the requirements.txt file with easy_install. If the + environment variable BRIDGEDB_INSTALL_DEPENDENCIES=0, then + setup.py will not use easy_install. When BridgeDB is installed + via `make install` the default is to not use easy_install; + however, when installed via `python setup.py install`, the default + is to use easy_install to check for, find, and install + dependencies. (NOTE: the latter is *not* recommended.) + (commit d035fe64) + + +Changes in version 0.3.0 - 2015-03-21 * FIXES #2895 https://bugs.torproject.org/2895 BridgeDB no longer assumes that any extrainfo descriptor files are

1 0

[bridgedb/master] Remove recaptcha-client==1.0.6 dependency.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 9ed51f301d95439544af515bbfb63d8efbcff211 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:42:20 2015 +0000 Remove recaptcha-client==1.0.6 dependency. --- .travis.requirements.txt | 1 - requirements.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index dbf110f..d514694 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -27,6 +27,5 @@ pygeoip==0.2.7 gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 -recaptcha-client==1.0.6 stem==1.3.0 zope.interface==3.6.1 diff --git a/requirements.txt b/requirements.txt index 6eeee59..d643958 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,5 @@ pygeoip==0.2.7 gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 -recaptcha-client==1.0.6 stem==1.3.0 zope.interface==3.6.1

1 0

[bridgedb/master] Add service_identity to requirements.txt and .travis.requirements.txt.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 0a1526a8894f9a72fcc7b91e3a16f2b6c3823247 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 24 23:58:11 2015 +0000 Add service_identity to requirements.txt and .travis.requirements.txt. The sevice_identity package is used by newer pyOpenSSL packages to provide better TLS hostname verification. This is recommended with Twisted>=14.0.0, however, because service_identity only requires pyOpenSSL>=0.12, we can install it for all versions. See https://travis-ci.org/isislovecruft/bridgedb/jobs/55582282#L1070 --- .travis.requirements.txt | 1 + requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index d514694..e106d8f 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -27,5 +27,6 @@ pygeoip==0.2.7 gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 +service_identity==14.0.0 stem==1.3.0 zope.interface==3.6.1 diff --git a/requirements.txt b/requirements.txt index d643958..40daca6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,6 @@ pygeoip==0.2.7 gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 +service_identity==14.0.0 stem==1.3.0 zope.interface==3.6.1

1 0

[bridgedb/master] Merge branch 'hotfix/0.3.0-twisted-14.0.2_r1' into develop
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 8f53b62ff569e11574fc5b3171e88c774821f257 Merge: 26b047d 6be3a91 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 04:02:07 2015 +0000 Merge branch 'hotfix/0.3.0-twisted-14.0.2_r1' into develop .travis.requirements.txt | 1 + lib/bridgedb/parse/versions.py | 11 ++++++-- lib/bridgedb/test/test_crypto.py | 18 +++++++++++++ lib/bridgedb/txrecaptcha.py | 55 ++++++++++++++++++++++++++++++++++---- requirements.txt | 1 + 5 files changed, 79 insertions(+), 7 deletions(-)

1 0

[bridgedb/master] Add badge for latest PyPI version in README.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit d11e15096a8accc5cf591807c85df374ce57120e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 02:17:46 2015 +0000 Add badge for latest PyPI version in README. --- README.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index a9a27fc..eca8b42 100644 --- a/README.rst +++ b/README.rst @@ -1,13 +1,14 @@ -***************************************** -BridgeDB |Build Status| |Coverage Status| -***************************************** +********************************************************** +BridgeDB |Latest Version| |Build Status| |Coverage Status| +********************************************************** BridgeDB is a collection of backend servers used to distribute `Tor Bridges <https://www.torproject.org/docs/bridges>`__. Currently, it mainly consists of a webserver with `an HTTPS interface <https://bridges.torproject.org>`__, `an email responder <mailto:bridges@torproject.org>`__, and an SQLite database. - +.. |Latest Version| image:: https://pypip.in/version/bridgedb/badge.svg?style=flat + :target: https://pypi.python.org/pypi/bridgedb/ .. |Build Status| image:: https://travis-ci.org/isislovecruft/bridgedb.svg :target: https://travis-ci.org/isislovecruft/bridgedb .. |Coverage Status| image:: https://coveralls.io/repos/isislovecruft/bridgedb/badge.png?branch=develop

1 0

[bridgedb/master] Check envvar before using easy_install to install setup.py requires.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit d035fe64d85b12e6dbc5ebb23093e876f83b6d0a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 03:00:26 2015 +0000 Check envvar before using easy_install to install setup.py requires. If there is an environment variable BRIDGEDB_INSTALL_DEPENDENCIES=0, then the setup.py script will not use easy_install to install dependencies. The default when using `make install` is to avoid using easy_install; the default when calling `python setup.py install` is to use easy_install. Until now, on BridgeDB's production server, `echo > requirements.txt` was run to avoid allowing easy_install to search for dependencies. This removes the need to do that. We shouldn't be erasing the requirements.txt file anymore, because it is kept under revision control and versioneer (which uses `git describe --tags --dirty --always` to dynamically determine the BridgeDB package version at install time) will add '-dirty' to the end of the version number if we change anything in the repo. Adding '-dirty' to the package version causes it to be invalid according to PEP440, causing other random failures such as the inability to discover scripts and packaged data which pkg_resources. --- Makefile | 4 ++-- setup.py | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8b6358b..c6c0442 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,11 @@ pyflakes: install: -python setup.py compile_catalog - python setup.py install --record installed-files.txt + BRIDGEDB_INSTALL_DEPENDENCIES=0 python setup.py install --record installed-files.txt force-install: -python setup.py compile_catalog - python setup.py install --force --record installed-files.txt + BRIDGEDB_INSTALL_DEPENDENCIES=0 python setup.py install --force --record installed-files.txt uninstall: touch installed-files.txt diff --git a/setup.py b/setup.py index 5e5de39..9402071 100644 --- a/setup.py +++ b/setup.py @@ -264,8 +264,19 @@ class runTests(setuptools.Command): sys.path = old_path +# If there is an environment variable BRIDGEDB_INSTALL_DEPENDENCIES=0, it will +# disable checking for, fetching, and installing BridgeDB's dependencies with +# easy_install. +# +# Setting BRIDGEDB_INSTALL_DEPENDENCIES=0 is *highly* recommended, because +# easy_install is a security nightmare. Automatically installing dependencies +# is enabled by default, however, because this is how all Python packages are +# supposed to work. +if bool(int(os.environ.get("BRIDGEDB_INSTALL_DEPENDENCIES", 1))): + requires, deplinks = get_requirements() +else: + requires, deplinks = [], [] -requires, deplinks = get_requirements() setuptools.setup( name='bridgedb',

1 0

[bridgedb/master] Add qrcode==5.0.1 and pillow>=2.6.1 to .travis.requirements.txt.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 41f2ac0ede34ecdcc86a39098a6116983ecf8c84 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 04:20:54 2015 +0000 Add qrcode==5.0.1 and pillow>=2.6.1 to .travis.requirements.txt. --- .travis.requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 0651712..dbf110f 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -25,6 +25,8 @@ https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pygeoip==0.2.7 gnupg==2.0.1 +pillow>=2.6.1 +qrcode==5.0.1 recaptcha-client==1.0.6 stem==1.3.0 zope.interface==3.6.1

1 0

[bridgedb/master] The twisted.python.util.Version class moved in Twisted>=14.0.2.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 2a3aa5af8ce80ed4bb13fff0d23fdfd97fccdbd4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 24 23:59:57 2015 +0000 The twisted.python.util.Version class moved in Twisted>=14.0.2. --- lib/bridgedb/parse/versions.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 8140357..ee62792 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -23,14 +23,21 @@ bridgedb.parse.versions .. """ -from twisted.python import util as txutil +from twisted import version as _txversion + +# The twisted.python.util.Version class was moved in Twisted==14.0.0 to +# twisted.python.versions.Version: +if _txversion.major >= 14: + from twisted.python.versions import Version as _Version +else: + from twisted.python.util import Version as _Version class InvalidVersionStringFormat(ValueError): """Raised when a version string is not in a parseable format.""" -class Version(txutil.Version): +class Version(_Version): """Holds, parses, and does comparison operations for version numbers. :attr str package: The package name, if available.

1 0

[bridgedb/master] Skip two unittests for SSLVerifyingContextFactory with Twisted>=14.0.0.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit e6808c2e83269a25bfe71427b17991871a8eecf6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:14:30 2015 +0000 Skip two unittests for SSLVerifyingContextFactory with Twisted>=14.0.0. --- lib/bridgedb/test/test_crypto.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index 9fb0448..3264ace 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -23,7 +23,9 @@ import shutil import OpenSSL +from twisted import version as _twistedversion from twisted.internet import defer +from twisted.python.versions import Version from twisted.trial import unittest from twisted.test.proto_helpers import StringTransport from twisted.web.test import test_agent as txtagent @@ -331,6 +333,14 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase, def test_getHostnameFromURL(self): """``getHostnameFromURL()`` should return a hostname from a URI.""" + if _twistedversion >= Version('twisted', 14, 0, 0): + raise unittest.SkipTest( + ("The SSLVerifyingContextFactory is no longer necessary in " + "Twisted>=14.0.0, because the way in which TLS certificates " + "are checked now includes certificate pinning, and the " + "SSLVerifyingContextFactory only implemented strict hostname " + "checking.")) + agent = txrecaptcha._getAgent(self.reactor, self.url) contextFactory = agent._contextFactory self.assertRegexpMatches(contextFactory.hostname, @@ -341,6 +351,14 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase, ``SSLVerifyingContextFactory.hostname`` does not match the one found in the level 0 certificate subject CN. """ + if _twistedversion >= Version('twisted', 14, 0, 0): + raise unittest.SkipTest( + ("The SSLVerifyingContextFactory is no longer necessary in " + "Twisted>=14.0.0, because the way in which TLS certificates " + "are checked now includes certificate pinning, and the " + "SSLVerifyingContextFactory only implemented strict hostname " + "checking.")) + agent = txrecaptcha._getAgent(self.reactor, self.url) contextFactory = agent._contextFactory x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,

1 0