some pep8 fixes

2010-11-13 23:33:50 +01:00 · 2010-11-13 23:33:50 +01:00 · a298cf753d
parent 0323c5247f
commit a298cf753d
4 changed files with 8 additions and 8 deletions
--- a/example/assertion/global_testmodule_config/conftest.py
+++ b/example/assertion/global_testmodule_config/conftest.py
@ -1,4 +1,4 @@
-import py
+import pytest, py
 mydir = py.path.local(__file__).dirpath()

 def pytest_runtest_setup(item):
--- a/tox.ini
+++ b/tox.ini
@ -57,6 +57,6 @@ commands=
 [pytest]
 minversion=2.0
 plugins=pytester
-addopts=-rfx --pyargs
+#addopts= -rxf --pyargs
 rsyncdirs=tox.ini pytest.py _pytest testing