commit 216937c0821e27301f60dd77a1addfb286b1b3ea Merge: 242569a 6c81b10 Author: Damian Johnson atagar@torproject.org Date: Sun Oct 13 17:40:51 2013 -0700

Correcting test issues with python 2.6 and 3.x

Generally I just work with python 2.7, so other interpretor versions just get love prior to releases. Most of this is issues with our tests, but @lru_cache introduced a lot of legitimate regressions for python 3.x.

run_tests.py | 6 +- stem/descriptor/__init__.py | 4 +- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 5 +- stem/descriptor/networkstatus.py | 3 + stem/descriptor/remote.py | 2 +- stem/descriptor/server_descriptor.py | 11 +- stem/exit_policy.py | 128 ++++++++++++++------- stem/prereq.py | 21 +++- stem/util/lru_cache.py | 2 +- stem/util/proc.py | 2 +- stem/version.py | 21 ++-- test/integ/control/controller.py | 7 +- test/integ/descriptor/networkstatus.py | 2 +- test/integ/descriptor/remote.py | 12 +- test/integ/process.py | 6 +- test/integ/response/protocolinfo.py | 8 +- test/integ/util/system.py | 6 +- test/network.py | 6 +- test/settings.cfg | 2 + test/unit/connection/authentication.py | 8 +- test/unit/control/controller.py | 8 +- test/unit/descriptor/export.py | 8 +- test/unit/descriptor/networkstatus/document_v3.py | 4 +- test/unit/descriptor/reader.py | 6 +- test/unit/descriptor/remote.py | 21 +++- test/unit/descriptor/server_descriptor.py | 8 +- test/unit/descriptor/tordnsel.py | 10 +- test/unit/response/events.py | 8 +- test/unit/response/protocolinfo.py | 8 +- test/unit/tutorial.py | 8 +- test/unit/util/connection.py | 8 +- test/unit/util/proc.py | 8 +- test/unit/util/system.py | 8 +- test/unit/version.py | 8 +- test/util.py | 6 +- 36 files changed, 278 insertions(+), 113 deletions(-)