commit f5d690e5e241c8b53f6c4b0efa9f2519819a024e Merge: 1773eba 411f8cc Author: Damian Johnson <atagar@torproject.org> Date: Sun May 5 18:05:43 2013 -0700 Using new syntax for exception variables Python has two styles for exception variables... * Python 2.7 and earlier (discontinued on 3.x) except ValueError, exc: * Python 2.6 and later (started in 2.5) except ValueError as exc: Change is thanks to Sean on... https://trac.torproject.org/8823 docs/republish.py | 4 +- docs/tutorials/to_russia_with_love.rst | 2 +- run_tests.py | 8 +++--- stem/connection.py | 46 +++++++++++++++--------------- stem/control.py | 42 ++++++++++++++-------------- stem/descriptor/__init__.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 8 +++--- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/reader.py | 16 +++++----- stem/descriptor/router_status_entry.py | 4 +- stem/descriptor/server_descriptor.py | 2 +- stem/response/events.py | 4 +- stem/response/protocolinfo.py | 2 +- stem/socket.py | 14 +++++----- stem/util/conf.py | 2 +- stem/util/proc.py | 6 ++-- stem/util/system.py | 2 +- stem/version.py | 4 +- test/integ/connection/authentication.py | 2 +- test/integ/control/controller.py | 8 +++--- test/network.py | 4 +- test/runner.py | 10 +++--- test/unit/response/getconf.py | 2 +- test/unit/response/getinfo.py | 2 +- test/util.py | 13 ++++++++- 25 files changed, 111 insertions(+), 100 deletions(-)