diff --git a/pyramid_deform/tests.py b/pyramid_deform/tests.py index c255e7e..a1a79c9 100644 --- a/pyramid_deform/tests.py +++ b/pyramid_deform/tests.py @@ -139,7 +139,7 @@ def check_form(self, form): inst() form = inst.form # All options should end up on the form, overriding any defaults - for key, value in dict(form_options).iteritems(): + for key, value in dict(form_options).items(): self.assertEqual(getattr(form, key), value) class TestFormWizardView(unittest.TestCase): diff --git a/tox.ini b/tox.ini index 3d5783a..dde589e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,10 @@ [tox] -envlist = py26,py27,py32,cover +envlist = py26,py27,py32,py33,cover [testenv] commands = - python setup.py test -q -deps = - nose - Mock - coverage + python setup.py dev + python setup.py nosetests [testenv:cover] basepython = @@ -15,7 +12,4 @@ basepython = commands = python setup.py nosetests --with-xunit --with-xcoverage deps = - nose - Mock - coverage nosexcover