Merged in dangra/pytest (pull request #132)

no need for im_func and it does not exists in python3

_pytest/unittest.py

@@ -154,7 +154,7 @@ def pytest_runtest_protocol(item, __multicall__):
     if isinstance(item, TestCaseFunction):
         if 'twisted.trial.unittest' in sys.modules:
             ut = sys.modules['twisted.python.failure']
-            Failure__init__ = ut.Failure.__init__.im_func
+            Failure__init__ = ut.Failure.__init__
             check_testcase_implements_trial_reporter()
             def excstore(self, exc_value=None, exc_type=None, exc_tb=None,
                 captureVars=None):

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 distshare={homedir}/.tox/distshare
-envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,trial
+envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial
 
 [testenv]
 changedir=testing
@@ -61,12 +61,22 @@ commands=
   py.test -n3 -rfsxX \
         --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing}
 
-[testenv:trial]
+[testenv:py27-trial]
 changedir=.
+basepython=python2.7
 deps=twisted
 commands=
   py.test -rsxf \
         --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py}
+
+[testenv:py33-trial]
+changedir=.
+basepython=python3.3
+deps={[testenv:py27-trial]deps}
+commands=
+  py.test -rsxf \
+        --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing/test_unittest.py}
+
 [testenv:doctest]
 changedir=.
 commands=py.test --doctest-modules _pytest