commit 356bdd30168d28f2d708ea50a530e78ff5bdd682 Merge: e9060e6 c24f8ce Author: Damian Johnson <atagar@torproject.org> Date: Fri Jan 1 13:41:21 2016 -0800 Fixing test compatibility for python 2.6 Quite a few testing issues have snuck in since our last release. Thanks to Foxboron for pointing this out! run_tests.py | 6 ++++++ stem/descriptor/export.py | 2 +- stem/prereq.py | 22 ++++++++++++++++++---- stem/util/__init__.py | 7 ++++++- test/integ/installation.py | 3 +++ test/integ/manual.py | 3 +++ test/runner.py | 2 +- test/unit/descriptor/export.py | 6 ++---- test/unit/tutorial_examples.py | 9 +++++++++ 9 files changed, 49 insertions(+), 11 deletions(-)