Author: Raffael Tfirst <[email protected]>
Branch: py3.5-async
Changeset: r85984:cf27d3b81de8
Date: 2016-08-02 13:27 +0200
http://bitbucket.org/pypy/pypy/changeset/cf27d3b81de8/
Log: Fix import error (PyPyClassCollector does not seem to exist anymore,
pypydir was imported from the wrong file in apptest)
diff --git a/pypy/tool/pytest/apptest.py b/pypy/tool/pytest/apptest.py
--- a/pypy/tool/pytest/apptest.py
+++ b/pypy/tool/pytest/apptest.py
@@ -16,7 +16,7 @@
from pypy.tool.pytest import appsupport
from pypy.tool.pytest.objspace import gettestobjspace
from rpython.tool.udir import udir
-from pypy.conftest import PyPyClassCollector, pypydir
+from pypy import pypydir
from inspect import getmro
pypyroot = os.path.dirname(pypydir)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
