Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3k
Changeset: r85042:3ef853b2c167
Date: 2016-06-08 20:54 +0100
http://bitbucket.org/pypy/pypy/changeset/3ef853b2c167/
Log: fix after the merge
diff --git a/pypy/module/posix/test/test_interp_posix.py
b/pypy/module/posix/test/test_interp_posix.py
--- a/pypy/module/posix/test/test_interp_posix.py
+++ b/pypy/module/posix/test/test_interp_posix.py
@@ -3,7 +3,7 @@
import py
from rpython.tool.udir import udir
-from pypy.conftest import pypydir
+from pypy import pypydir
from pypy.module.posix.interp_posix import convert_seconds
class TestPexpect(object):
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,8 @@
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 pypy.conftest import PyPyClassCollector
from inspect import getmro
pypyroot = os.path.dirname(pypydir)
@@ -58,7 +59,7 @@
else:
return r
elif isinstance(value, type):
- return type.__name__
+ return type.__name__
else:
return repr(value)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
