Merged in bubenkoff/pytest/fix-broken-tests (pull request #65)

Fix broken python3 and python2.5 tests

testing/test_fixture_finalizer.py

@@ -5,12 +5,13 @@ import py.code
 def test_fixture_finalizer(testdir):
     testdir.makeconftest("""
     import pytest
+    import sys
 
     @pytest.fixture
     def browser(request):
 
         def finalize():
-            print 'Finalized'
+            sys.stdout.write('Finalized')
         request.addfinalizer(finalize)
         return {}
     """)

tox.ini

@@ -31,6 +31,7 @@ commands=
 changedir=.
 basepython=python2.7
 deps=pytest-xdist
+distribute=true
 setenv=
     PYTHONDONTWRITEBYTECODE=1
 commands=