commit 2c8bfa84880fdcefe43137f0f097831bf06aa1a9 Author: Damian Johnson atagar@torproject.org Date: Thu Jan 9 09:30:11 2014 -0800

Updating year in copyright notices

Feels a little silly that we need to do this, but oh well. --- run_tests.py | 2 +- setup.py | 2 +- stem/__init__.py | 2 +- stem/connection.py | 2 +- stem/control.py | 2 +- stem/descriptor/__init__.py | 2 +- stem/descriptor/export.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 2 +- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/reader.py | 2 +- stem/descriptor/remote.py | 2 +- stem/descriptor/router_status_entry.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/descriptor/tordnsel.py | 2 +- stem/exit_policy.py | 2 +- stem/prereq.py | 5 +++-- stem/process.py | 2 +- stem/response/__init__.py | 2 +- stem/response/authchallenge.py | 2 +- stem/response/events.py | 2 +- stem/response/getconf.py | 2 +- stem/response/getinfo.py | 2 +- stem/response/mapaddress.py | 2 +- stem/response/protocolinfo.py | 2 +- stem/socket.py | 2 +- stem/util/__init__.py | 2 +- stem/util/conf.py | 2 +- stem/util/connection.py | 2 +- stem/util/enum.py | 2 +- stem/util/log.py | 2 +- stem/util/proc.py | 2 +- stem/util/str_tools.py | 2 +- stem/util/system.py | 2 +- stem/util/term.py | 2 +- stem/util/tor_tools.py | 2 +- stem/version.py | 2 +- test/__init__.py | 2 +- test/mocking.py | 2 +- test/network.py | 2 +- test/output.py | 2 +- test/prompt.py | 2 +- test/runner.py | 2 +- test/util.py | 2 +- 44 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/run_tests.py b/run_tests.py index f28ab8e..ae10df9 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/setup.py b/setup.py index 9ac187a..0aa8b00 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

# We cannot import anything from the stem module since this would risk diff --git a/stem/__init__.py b/stem/__init__.py index 0415152..2663b45 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/connection.py b/stem/connection.py index dea9b00..82ad25b 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/control.py b/stem/control.py index 646edd8..adfc56f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index d6b007e..7d08e91 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index 764113b..ed4ef5a 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index b13efff..23a5917 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 61dce83..4c05df7 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -1,4 +1,4 @@ -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2013-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index b3a0cc7..0576375 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 1612159..dc4db08 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index e1ebfb2..187ed84 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -1,4 +1,4 @@ -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2013-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 6600e31..05810ac 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index d4dbaf3..5537de7 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index 3d7da86..c629539 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -1,4 +1,4 @@ -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2013-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 4664c57..169eb13 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/prereq.py b/stem/prereq.py index df2e10d..43d1dc2 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" @@ -36,7 +36,8 @@ def check_requirements(): Checks that we meet the minimum requirements to run stem. If we don't then this raises an ImportError with the issue.

- :raises: ImportError with the problem if we don't meet stem's requirements + :raises: **ImportError** with the problem if we don't meet stem's + requirements """

major_version, minor_version = sys.version_info[0:2] diff --git a/stem/process.py b/stem/process.py index 9f4250f..7587372 100644 --- a/stem/process.py +++ b/stem/process.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 7298abe..39e39cb 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/response/authchallenge.py b/stem/response/authchallenge.py index 18a5b2c..2f22c2b 100644 --- a/stem/response/authchallenge.py +++ b/stem/response/authchallenge.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

import binascii diff --git a/stem/response/events.py b/stem/response/events.py index 19e1680..931127d 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

import datetime diff --git a/stem/response/getconf.py b/stem/response/getconf.py index 1b9007f..0eaafcb 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index c613ded..4cced1b 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/response/mapaddress.py b/stem/response/mapaddress.py index 8799ea1..79428e1 100644 --- a/stem/response/mapaddress.py +++ b/stem/response/mapaddress.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/response/protocolinfo.py b/stem/response/protocolinfo.py index 0b4d352..96fe3a4 100644 --- a/stem/response/protocolinfo.py +++ b/stem/response/protocolinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/socket.py b/stem/socket.py index d1f4896..dfdce08 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/__init__.py b/stem/util/__init__.py index dacd804..339a62a 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/conf.py b/stem/util/conf.py index 8a4f361..c11adf2 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/connection.py b/stem/util/connection.py index cd4fa70..e36d6c0 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/enum.py b/stem/util/enum.py index ee5a9c1..5cd1f4f 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/log.py b/stem/util/log.py index b87e741..7e77911 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/proc.py b/stem/util/proc.py index 95e75de..9bdc54a 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 33d5e1b..71d5969 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/system.py b/stem/util/system.py index 9b28e04..39552cf 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/term.py b/stem/util/term.py index f1c71ec..411e869 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index e4d1e0c..5a194d3 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/version.py b/stem/version.py index b0563d5..d0dae78 100644 --- a/stem/version.py +++ b/stem/version.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/__init__.py b/test/__init__.py index 19f615f..1a71ca8 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/mocking.py b/test/mocking.py index 3f211e7..2b73b9f 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/network.py b/test/network.py index fbb378a..ffd58d4 100644 --- a/test/network.py +++ b/test/network.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/output.py b/test/output.py index 1d7631e..dc3d7d0 100644 --- a/test/output.py +++ b/test/output.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/prompt.py b/test/prompt.py index 8939987..278f2d6 100644 --- a/test/prompt.py +++ b/test/prompt.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/runner.py b/test/runner.py index e8d77d1..e88b5c0 100644 --- a/test/runner.py +++ b/test/runner.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson and The Tor Project +# Copyright 2011-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/util.py b/test/util.py index f4fb9fb..384f9b6 100644 --- a/test/util.py +++ b/test/util.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson and The Tor Project +# Copyright 2012-2014, Damian Johnson and The Tor Project # See LICENSE for licensing information

"""