[pypy-commit] pypy prepare-split: updated py imports from _pytest/ to pypy._py

[Aquana]

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: prepare-split
Changeset: r69027:6e7d0e9dc336
Date: 2014-01-31 00:23 +0100
http://bitbucket.org/pypy/pypy/changeset/6e7d0e9dc336/

Log:	updated py imports from _pytest/ to pypy._py

diff --git a/_pytest/assertion/__init__.py b/_pytest/assertion/__init__.py
--- a/_pytest/assertion/__init__.py
+++ b/_pytest/assertion/__init__.py
@@ -1,7 +1,7 @@
 """
 support for presenting detailed information in failing assertions.
 """
-import py
+import pypy._py as py
 import sys
 import pytest
 from _pytest.monkeypatch import monkeypatch
diff --git a/_pytest/assertion/newinterpret.py b/_pytest/assertion/newinterpret.py
--- a/_pytest/assertion/newinterpret.py
+++ b/_pytest/assertion/newinterpret.py
@@ -6,7 +6,7 @@
 import sys
 import ast
 
-import py
+import pypy._py as py
 from _pytest.assertion import util
 from _pytest.assertion.reinterpret import BuiltinAssertionError
 
diff --git a/_pytest/assertion/oldinterpret.py b/_pytest/assertion/oldinterpret.py
--- a/_pytest/assertion/oldinterpret.py
+++ b/_pytest/assertion/oldinterpret.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys, inspect
 from compiler import parse, ast, pycodegen
 from _pytest.assertion.util import format_explanation, BuiltinAssertionError
diff --git a/_pytest/assertion/reinterpret.py b/_pytest/assertion/reinterpret.py
--- a/_pytest/assertion/reinterpret.py
+++ b/_pytest/assertion/reinterpret.py
@@ -1,5 +1,5 @@
 import sys
-import py
+import pypy._py as py
 from _pytest.assertion.util import BuiltinAssertionError
 
 class AssertionError(BuiltinAssertionError):
diff --git a/_pytest/assertion/rewrite.py b/_pytest/assertion/rewrite.py
--- a/_pytest/assertion/rewrite.py
+++ b/_pytest/assertion/rewrite.py
@@ -10,7 +10,7 @@
 import sys
 import types
 
-import py
+import pypy._py as py
 from _pytest.assertion import util
 
 
diff --git a/_pytest/assertion/util.py b/_pytest/assertion/util.py
--- a/_pytest/assertion/util.py
+++ b/_pytest/assertion/util.py
@@ -1,6 +1,6 @@
 """Utilities for assertion debugging"""
 
-import py
+import pypy._py as py
 
 BuiltinAssertionError = py.builtin.builtins.AssertionError
 
diff --git a/_pytest/capture.py b/_pytest/capture.py
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -1,6 +1,6 @@
 """ per-test stdout/stderr capturing mechanisms, ``capsys`` and ``capfd`` function arguments.  """
 
-import pytest, py
+import pytest, pypy._py as py
 import os
 
 def pytest_addoption(parser):
diff --git a/_pytest/config.py b/_pytest/config.py
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -1,6 +1,6 @@
 """ command line options, ini-file and conftest.py processing. """
 
-import py
+import pypy._py as py
 import sys, os
 from _pytest.core import PluginManager
 import pytest
@@ -125,7 +125,7 @@
 
 class Conftest(object):
     """ the single place for accessing values and interacting
-        towards conftest modules from py.test objects.
+        towards conftest modules from pypy._py.test objects.
     """
     def __init__(self, onimport=None, confcutdir=None):
         self._path2confmods = {}
diff --git a/_pytest/core.py b/_pytest/core.py
--- a/_pytest/core.py
+++ b/_pytest/core.py
@@ -4,7 +4,7 @@
 """
 import sys, os
 import inspect
-import py
+import pypy._py as py
 from _pytest import hookspec # the extension point definitions
 
 assert py.__version__.split(".")[:2] >= ['1', '4'], ("installation problem: "
diff --git a/_pytest/doctest.py b/_pytest/doctest.py
--- a/_pytest/doctest.py
+++ b/_pytest/doctest.py
@@ -1,7 +1,7 @@
 """ discover and run doctests in modules and test files."""
 
-import pytest, py
-from py._code.code import TerminalRepr, ReprFileLocation
+import pytest, pypy._py as py
+from pypy._py._code.code import TerminalRepr, ReprFileLocation
 
 def pytest_addoption(parser):
     group = parser.getgroup("collect")
diff --git a/_pytest/genscript.py b/_pytest/genscript.py
--- a/_pytest/genscript.py
+++ b/_pytest/genscript.py
@@ -1,5 +1,5 @@
 """ generate a single-file self-contained version of py.test """
-import py
+import pypy._py as py
 
 def find_toplevel(name):
     for syspath in py.std.sys.path:
diff --git a/_pytest/helpconfig.py b/_pytest/helpconfig.py
--- a/_pytest/helpconfig.py
+++ b/_pytest/helpconfig.py
@@ -1,5 +1,5 @@
 """ version info, help messages, tracing configuration.  """
-import py
+import pypy._py as py
 import pytest
 import os, inspect, sys
 from _pytest.core import varnames
diff --git a/_pytest/junitxml.py b/_pytest/junitxml.py
--- a/_pytest/junitxml.py
+++ b/_pytest/junitxml.py
@@ -3,7 +3,7 @@
 Based on initial code from Ross Lawley.
 """
 
-import py
+import pypy._py as py
 import os
 import re
 import sys
diff --git a/_pytest/main.py b/_pytest/main.py
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -1,6 +1,6 @@
 """ core implementation of testing process: init, session, runtest loop. """
 
-import py
+import pypy._py as py
 import pytest, _pytest
 import os, sys, imp
 tracebackcutdir = py.path.local(_pytest.__file__).dirpath()
diff --git a/_pytest/mark.py b/_pytest/mark.py
--- a/_pytest/mark.py
+++ b/_pytest/mark.py
@@ -1,5 +1,5 @@
 """ generic mechanism for marking and selecting python functions. """
-import pytest, py
+import pytest, pypy._py as py
 
 def pytest_namespace():
     return {'mark': MarkGenerator()}
@@ -115,7 +115,7 @@
     """ Factory for :class:`MarkDecorator` objects - exposed as
     a ``py.test.mark`` singleton instance.  Example::
 
-         import py
+         import pypy._py as py
          @py.test.mark.slowtest
          def test_function():
             pass
diff --git a/_pytest/nose.py b/_pytest/nose.py
--- a/_pytest/nose.py
+++ b/_pytest/nose.py
@@ -1,6 +1,6 @@
 """ run test suites written for nose. """
 
-import pytest, py
+import pytest, pypy._py as py
 import inspect
 import sys
 
diff --git a/_pytest/pastebin.py b/_pytest/pastebin.py
--- a/_pytest/pastebin.py
+++ b/_pytest/pastebin.py
@@ -1,5 +1,5 @@
 """ submit failure or test session information to a pastebin service. """
-import py, sys
+import pypy._py as py, sys
 
 class url:
     base = "http://paste.pocoo.org"
diff --git a/_pytest/pdb.py b/_pytest/pdb.py
--- a/_pytest/pdb.py
+++ b/_pytest/pdb.py
@@ -1,6 +1,6 @@
 """ interactive debugging with PDB, the Python Debugger. """
 
-import pytest, py
+import pytest, pypy._py as py
 import sys
 
 def pytest_addoption(parser):
diff --git a/_pytest/pytester.py b/_pytest/pytester.py
--- a/_pytest/pytester.py
+++ b/_pytest/pytester.py
@@ -1,13 +1,13 @@
 """ (disabled by default) support for testing py.test and py.test plugins. """
 
-import py, pytest
+import pypy._py as py, pytest
 import sys, os
 import re
 import inspect
 import time
 from fnmatch import fnmatch
 from _pytest.main import Session, EXIT_OK
-from py.builtin import print_
+from pypy._py.builtin import print_
 from _pytest.core import HookRelay
 
 def pytest_addoption(parser):
@@ -114,7 +114,7 @@
 
     def contains(self, entries):
         __tracebackhide__ = True
-        from py.builtin import print_
+        from pypy._py.builtin import print_
         i = 0
         entries = list(entries)
         backlocals = py.std.sys._getframe(1).f_locals
diff --git a/_pytest/python.py b/_pytest/python.py
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1,9 +1,9 @@
 """ Python test discovery, setup and run of test functions. """
-import py
+import pypy._py as py
 import inspect
 import sys
 import pytest
-from py._code.code import TerminalRepr
+from pypy._py._code.code import TerminalRepr
 from _pytest.monkeypatch import monkeypatch
 
 import _pytest
diff --git a/_pytest/recwarn.py b/_pytest/recwarn.py
--- a/_pytest/recwarn.py
+++ b/_pytest/recwarn.py
@@ -1,6 +1,6 @@
 """ recording warnings during test function execution. """
 
-import py
+import pypy._py as py
 import sys, os
 
 def pytest_funcarg__recwarn(request):
diff --git a/_pytest/resultlog.py b/_pytest/resultlog.py
--- a/_pytest/resultlog.py
+++ b/_pytest/resultlog.py
@@ -1,6 +1,6 @@
 """ (disabled by default) create result information in a plain text file. """
 
-import py
+import pypy._py as py
 
 def pytest_addoption(parser):
     group = parser.getgroup("terminal reporting", "resultlog plugin options")
diff --git a/_pytest/runner.py b/_pytest/runner.py
--- a/_pytest/runner.py
+++ b/_pytest/runner.py
@@ -1,7 +1,7 @@
 """ basic collect and runtest protocol implementations """
 
-import py, sys, time
-from py._code.code import TerminalRepr
+import pypy._py as py, sys, time
+from pypy._py._code.code import TerminalRepr
 
 def pytest_namespace():
     return {
diff --git a/_pytest/skipping.py b/_pytest/skipping.py
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -1,6 +1,6 @@
 """ support for skip/xfail functions and markers. """
 
-import py, pytest
+import pypy._py as py, pytest
 import sys
 
 def pytest_addoption(parser):
diff --git a/_pytest/terminal.py b/_pytest/terminal.py
--- a/_pytest/terminal.py
+++ b/_pytest/terminal.py
@@ -2,7 +2,7 @@
 
 This is a good source for looking at the various reporting hooks.
 """
-import pytest, py
+import pytest, pypy._py as py
 import sys
 import os
 
diff --git a/_pytest/tmpdir.py b/_pytest/tmpdir.py
--- a/_pytest/tmpdir.py
+++ b/_pytest/tmpdir.py
@@ -1,5 +1,5 @@
 """ support for providing temporary directories to test functions.  """
-import pytest, py
+import pytest, pypy._py as py
 from _pytest.monkeypatch import monkeypatch
 
 class TempdirHandler:
diff --git a/_pytest/unittest.py b/_pytest/unittest.py
--- a/_pytest/unittest.py
+++ b/_pytest/unittest.py
@@ -1,5 +1,5 @@
 """ discovery and running of std-library "unittest" style tests. """
-import pytest, py
+import pytest, pypy._py as py
 import sys, pdb
 
 # for transfering markers