Merge pull request #139 from tkf/tox-25

Fix setup.py and make 2.5 test runnable with tox

setup.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import with_statement
 from setuptools import setup
 
 __AUTHOR__ = 'David Halter'

tox.ini

@@ -6,3 +6,6 @@ commands =
     python run.py
     python refactor.py
 changedir = test
+[testenv:py25]
+deps =
+    simplejson