[tor-commits] [bridgedb/master] Update copyrights to 2015.

commit c7292d86fde81a3d8f8cb7a8ad80dea4df3f061c Author: Isis Lovecruft isis@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@torproject.org # Matthew Finkel 0x017DD169EA793BE2 sysrqb@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@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@torproject.org # Nick Mathewson 0x21194EBB165733EA nickm@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@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@torproject.org 0xA3ADB67A2CDB8B35 # Matthew Finkel sysrqb@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@torproject.org 0xA3ADB67A2CDB8B35 # Matthew Finkel sysrqb@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@torproject.org 0xA3ADB67A2CDB8B35 # Matthew Finkel sysrqb@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@torproject.org 0xA3ADB67A2CDB8B35 # Matthew Finkel sysrqb@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@torproject.org # Matthew Finkel 0x017DD169EA793BE2 sysrqb@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."""