commit 4b79530c47abdeebb33bc7c06a6a6bda4e2815b6 Merge: 09acb5e 1c01521 Author: Damian Johnson <atagar@torproject.org> Date: Sun Jun 24 18:20:59 2012 -0700 Python 2.5 and OSX compatability fixes stem/control.py | 10 ++++-- stem/descriptor/reader.py | 60 ++++++++++++++++++++++++-------------- stem/process.py | 18 ++++++++++- stem/util/system.py | 19 +++++++++++- test/integ/descriptor/reader.py | 9 +++++- test/integ/process.py | 30 +++++++++++++++++-- test/integ/util/system.py | 13 +++++++- test/runner.py | 9 +++++- 8 files changed, 133 insertions(+), 35 deletions(-)