Author: mattip Branch: Changeset: r60364:950e5a445280 Date: 2013-01-23 10:31 +0200 http://bitbucket.org/pypy/pypy/changeset/950e5a445280/
Log: file moved diff --git a/lib-python/conftest.py b/lib-python/conftest.py --- a/lib-python/conftest.py +++ b/lib-python/conftest.py @@ -18,7 +18,7 @@ from pypy.tool.pytest import appsupport from pypy.tool.pytest.confpath import pypydir, testdir, testresultdir -from pypy.config.parse import parse_info +from rpython.config.parse import parse_info pytest_plugins = "resultlog", rsyncdirs = ['.', '../pypy/'] _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
