fix py32 failures and remove random print from commit accident

lawrenceakka · Dec 16, 2013 · 563465f · 563465f
1 parent b9cd7c1
commit 563465f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/_pytest/python.py b/_pytest/python.py
@@ -1623,7 +1623,6 @@ def merge(otherlist):
         return fixturenames_closure, arg2fixturedefs
 
     def pytest_generate_tests(self, metafunc):
-        print "pytest core pytest_generate_tests"
         for argname in metafunc.fixturenames:
             faclist = metafunc._arg2fixturedefs.get(argname)
             if faclist is None:

diff --git a/testing/test_genscript.py b/testing/test_genscript.py
@@ -22,7 +22,8 @@ def run(self, anypython, testdir, *args):
 def test_gen(testdir, anypython, standalone):
     if sys.version_info >= (2,7):
         result = testdir._run(anypython, "-c",
-                                "import sys;print sys.version_info >=(2,7)")
+                                "import sys;print (sys.version_info >=(2,7))")
+        assert result.ret == 0
         if result.stdout.str() == "False":
             pytest.skip("genscript called from python2.7 cannot work "
                         "earlier python versions")