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

[Aquana]

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

Log:	updated py imports in pypy/ to pypy._py

diff too long, truncating to 2000 out of 3218 lines

diff --git a/pypy/_py/__init__.py b/pypy/_py/__init__.py
--- a/pypy/_py/__init__.py
+++ b/pypy/_py/__init__.py
@@ -10,7 +10,7 @@
 """
 __version__ = '1.4.7'
 
-from py import _apipkg
+from pypy._py import _apipkg
 
 # so that py.error.* instances are picklable
 import sys
diff --git a/pypy/_py/__metainfo.py b/pypy/_py/__metainfo.py
--- a/pypy/_py/__metainfo.py
+++ b/pypy/_py/__metainfo.py
@@ -1,2 +1,2 @@
-import py
+import pypy._py as py
 pydir = py.path.local(py.__file__).dirpath()
diff --git a/pypy/_py/_code/_assertionnew.py b/pypy/_py/_code/_assertionnew.py
--- a/pypy/_py/_code/_assertionnew.py
+++ b/pypy/_py/_code/_assertionnew.py
@@ -6,7 +6,7 @@
 import sys
 import ast
 
-import py
+import pypy._py as py
 from py._code.assertion import _format_explanation, BuiltinAssertionError
 
 
diff --git a/pypy/_py/_code/_assertionold.py b/pypy/_py/_code/_assertionold.py
--- a/pypy/_py/_code/_assertionold.py
+++ b/pypy/_py/_code/_assertionold.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys, inspect
 from compiler import parse, ast, pycodegen
 from py._code.assertion import BuiltinAssertionError, _format_explanation
diff --git a/pypy/_py/_code/assertion.py b/pypy/_py/_code/assertion.py
--- a/pypy/_py/_code/assertion.py
+++ b/pypy/_py/_code/assertion.py
@@ -1,5 +1,5 @@
 import sys
-import py
+import pypy._py as py
 
 BuiltinAssertionError = py.builtin.builtins.AssertionError
 
diff --git a/pypy/_py/_code/code.py b/pypy/_py/_code/code.py
--- a/pypy/_py/_code/code.py
+++ b/pypy/_py/_code/code.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys, os.path
 
 builtin_repr = repr
diff --git a/pypy/_py/_code/source.py b/pypy/_py/_code/source.py
--- a/pypy/_py/_code/source.py
+++ b/pypy/_py/_code/source.py
@@ -1,7 +1,7 @@
 from __future__ import generators
 import sys
 import inspect, tokenize
-import py
+import pypy._py as py
 from types import ModuleType
 cpy_compile = compile
 
diff --git a/pypy/_py/_io/capture.py b/pypy/_py/_io/capture.py
--- a/pypy/_py/_io/capture.py
+++ b/pypy/_py/_io/capture.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import py
+import pypy._py as py
 import tempfile
 
 try:
diff --git a/pypy/_py/_io/saferepr.py b/pypy/_py/_io/saferepr.py
--- a/pypy/_py/_io/saferepr.py
+++ b/pypy/_py/_io/saferepr.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys, os.path
 
 builtin_repr = repr
diff --git a/pypy/_py/_io/terminalwriter.py b/pypy/_py/_io/terminalwriter.py
--- a/pypy/_py/_io/terminalwriter.py
+++ b/pypy/_py/_io/terminalwriter.py
@@ -6,7 +6,7 @@
 
 
 import sys, os
-import py
+import pypy._py as py
 
 win32_and_ctypes = False
 if sys.platform == "win32":
diff --git a/pypy/_py/_log/log.py b/pypy/_py/_log/log.py
--- a/pypy/_py/_log/log.py
+++ b/pypy/_py/_log/log.py
@@ -14,7 +14,7 @@
                      debug=py.log.STDOUT,
                      command=None)
 """
-import py, sys
+import pypy._py as py, sys
 
 class Message(object):
     def __init__(self, keywords, args):
diff --git a/pypy/_py/_log/warning.py b/pypy/_py/_log/warning.py
--- a/pypy/_py/_log/warning.py
+++ b/pypy/_py/_log/warning.py
@@ -1,4 +1,4 @@
-import py, sys
+import pypy._py as py, sys
 
 class DeprecationWarning(DeprecationWarning):
     def __init__(self, msg, path, lineno):
diff --git a/pypy/_py/_path/common.py b/pypy/_py/_path/common.py
--- a/pypy/_py/_path/common.py
+++ b/pypy/_py/_path/common.py
@@ -1,7 +1,7 @@
 """
 """
 import os, sys
-import py
+import pypy._py as py
 
 class Checkers:
     _depend_on_existence = 'exists', 'link', 'dir', 'file'
diff --git a/pypy/_py/_path/local.py b/pypy/_py/_path/local.py
--- a/pypy/_py/_path/local.py
+++ b/pypy/_py/_path/local.py
@@ -2,7 +2,7 @@
 local path implementation.
 """
 import sys, os, stat, re, atexit
-import py
+import pypy._py as py
 from py._path import common
 
 iswin32 = sys.platform == "win32" or (getattr(os, '_name', False) == 'nt')
diff --git a/pypy/_py/_path/svnurl.py b/pypy/_py/_path/svnurl.py
--- a/pypy/_py/_path/svnurl.py
+++ b/pypy/_py/_path/svnurl.py
@@ -5,8 +5,8 @@
 """
 
 import os, sys, time, re
-import py
-from py import path, process
+import pypy._py as py
+from pypy._py import path, process
 from py._path import common
 from py._path import svnwc as svncommon
 from py._path.cacheutil import BuildcostAccessCache, AgingCache
diff --git a/pypy/_py/_path/svnwc.py b/pypy/_py/_path/svnwc.py
--- a/pypy/_py/_path/svnwc.py
+++ b/pypy/_py/_path/svnwc.py
@@ -6,7 +6,7 @@
 """
 
 import os, sys, time, re, calendar
-import py
+import pypy._py as py
 import subprocess
 from py._path import common
 
diff --git a/pypy/_py/_process/cmdexec.py b/pypy/_py/_process/cmdexec.py
--- a/pypy/_py/_process/cmdexec.py
+++ b/pypy/_py/_process/cmdexec.py
@@ -4,7 +4,7 @@
 
 import os, sys
 import subprocess
-import py
+import pypy._py as py
 from subprocess import Popen, PIPE
 
 def cmdexec(cmd):
diff --git a/pypy/_py/_process/forkedfunc.py b/pypy/_py/_process/forkedfunc.py
--- a/pypy/_py/_process/forkedfunc.py
+++ b/pypy/_py/_process/forkedfunc.py
@@ -7,7 +7,7 @@
     XXX see if tempdir handling is sane
 """
 
-import py
+import pypy._py as py
 import os
 import sys
 import marshal
diff --git a/pypy/_py/_process/killproc.py b/pypy/_py/_process/killproc.py
--- a/pypy/_py/_process/killproc.py
+++ b/pypy/_py/_process/killproc.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import os, sys
 
 if sys.platform == "win32" or getattr(os, '_name', '') == 'nt':
diff --git a/pypy/_py/_xmlgen.py b/pypy/_py/_xmlgen.py
--- a/pypy/_py/_xmlgen.py
+++ b/pypy/_py/_xmlgen.py
@@ -4,7 +4,7 @@
 
 (c) holger krekel, holger at merlinux eu. 2009
 """
-import py
+import pypy._py as py
 import sys, re
 
 if sys.version_info >= (3,0):
diff --git a/pypy/_py/bin/_findpy.py b/pypy/_py/bin/_findpy.py
--- a/pypy/_py/bin/_findpy.py
+++ b/pypy/_py/bin/_findpy.py
@@ -31,7 +31,7 @@
         if not searchpy(opd(__file__)):
             pass # let's hope it is just on sys.path
 
-import py
+import pypy._py as py
 import pytest
 
 if __name__ == '__main__':
diff --git a/pypy/config/makerestdoc.py b/pypy/config/makerestdoc.py
--- a/pypy/config/makerestdoc.py
+++ b/pypy/config/makerestdoc.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.tool.rest.rst import Rest, Paragraph, Strong, ListItem, Title, Link
 from pypy.tool.rest.rst import Directive, Text
 
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -1,6 +1,6 @@
 import sys
 
-import py
+import pypy._py as py
 
 from rpython.config.config import (OptionDescription, BoolOption, IntOption,
   ChoiceOption, StrOption, to_optparse, ConflictConfigError)
diff --git a/pypy/config/test/test_makerestdoc.py b/pypy/config/test/test_makerestdoc.py
--- a/pypy/config/test/test_makerestdoc.py
+++ b/pypy/config/test/test_makerestdoc.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from rpython.config.config import *
 from pypy.config.makerestdoc import make_cmdline_overview
diff --git a/pypy/config/test/test_pypyoption.py b/pypy/config/test/test_pypyoption.py
--- a/pypy/config/test/test_pypyoption.py
+++ b/pypy/config/test/test_pypyoption.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.config.pypyoption import get_pypy_config, set_pypy_opt_level
 from rpython.config.config import Config, ConfigError
 from rpython.config.translationoption import set_opt_level
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -1,4 +1,4 @@
-import py, pytest, sys, os, textwrap
+import pypy._py as py, pytest, sys, os, textwrap
 from inspect import isclass
 
 # pytest settings
diff --git a/pypy/doc/config/generate.py b/pypy/doc/config/generate.py
--- a/pypy/doc/config/generate.py
+++ b/pypy/doc/config/generate.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.config import pypyoption, makerestdoc
 from pypy.doc.config.confrest import all_optiondescrs
 from rpython.config import translationoption, config
diff --git a/pypy/doc/config/makemodules.py b/pypy/doc/config/makemodules.py
--- a/pypy/doc/config/makemodules.py
+++ b/pypy/doc/config/makemodules.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.config import pypyoption
 from rpython.config import translationoption, config
 
diff --git a/pypy/doc/confrest.py b/pypy/doc/confrest.py
--- a/pypy/doc/confrest.py
+++ b/pypy/doc/confrest.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 # XXX importing/inheriting from an internal py lib class is hackish
 from confrest_oldpy import Project, Page, relpath
diff --git a/pypy/doc/confrest_oldpy.py b/pypy/doc/confrest_oldpy.py
--- a/pypy/doc/confrest_oldpy.py
+++ b/pypy/doc/confrest_oldpy.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.tool.rest.rest import convert_rest_html, strip_html_header 
 from pypy.tool.difftime import worded_time 
 
diff --git a/pypy/doc/pypyconfig.py b/pypy/doc/pypyconfig.py
--- a/pypy/doc/pypyconfig.py
+++ b/pypy/doc/pypyconfig.py
@@ -8,6 +8,6 @@
     from pypy.doc.config import generate 
 
     from pypy.config import makerestdoc
-    import py
+    import pypy._py as py
     role = makerestdoc.register_config_role(py.path.local())
     app.add_role("config", role)
diff --git a/pypy/doc/statistic/confrest.py b/pypy/doc/statistic/confrest.py
--- a/pypy/doc/statistic/confrest.py
+++ b/pypy/doc/statistic/confrest.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.doc.confrest import *
 
 class PyPyPage(Page): 
diff --git a/pypy/doc/statistic/format.py b/pypy/doc/statistic/format.py
--- a/pypy/doc/statistic/format.py
+++ b/pypy/doc/statistic/format.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import datetime
 import dateutil
 from dateutil import parser
diff --git a/pypy/doc/statistic/rebin.py b/pypy/doc/statistic/rebin.py
--- a/pypy/doc/statistic/rebin.py
+++ b/pypy/doc/statistic/rebin.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 chunks = 7
 
diff --git a/pypy/doc/test/test_whatsnew.py b/pypy/doc/test/test_whatsnew.py
--- a/pypy/doc/test/test_whatsnew.py
+++ b/pypy/doc/test/test_whatsnew.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import pypy
 from commands import getoutput, getstatusoutput
 ROOT = py.path.local(pypy.__file__).dirpath().dirpath()
diff --git a/pypy/doc/tool/makecontributor.py b/pypy/doc/tool/makecontributor.py
--- a/pypy/doc/tool/makecontributor.py
+++ b/pypy/doc/tool/makecontributor.py
@@ -1,6 +1,6 @@
 # NOTE: run this script with LANG=en_US.UTF-8
 
-import py
+import pypy._py as py
 import sys
 from collections import defaultdict
 import operator
diff --git a/pypy/doc/tool/makeref.py b/pypy/doc/tool/makeref.py
--- a/pypy/doc/tool/makeref.py
+++ b/pypy/doc/tool/makeref.py
@@ -1,5 +1,5 @@
 
-import py
+import pypy._py as py
 import pypy
 pypydir = py.path.local(pypy.__file__).join('..')
 distdir = pypydir.dirpath()
diff --git a/pypy/doc/tool/mydot.py b/pypy/doc/tool/mydot.py
--- a/pypy/doc/tool/mydot.py
+++ b/pypy/doc/tool/mydot.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import py
+import pypy._py as py
 import string
 import re
 
diff --git a/pypy/goal/getnightly.py b/pypy/goal/getnightly.py
--- a/pypy/goal/getnightly.py
+++ b/pypy/goal/getnightly.py
@@ -2,7 +2,7 @@
 
 import sys
 import os
-import py
+import pypy._py as py
 
 if sys.platform.startswith('linux'):
     arch = 'linux'
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 import os, sys
 
diff --git a/pypy/interpreter/astcompiler/test/stdlib_testall.py b/pypy/interpreter/astcompiler/test/stdlib_testall.py
--- a/pypy/interpreter/astcompiler/test/stdlib_testall.py
+++ b/pypy/interpreter/astcompiler/test/stdlib_testall.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.interpreter.astcompiler.test.test_compiler import compile_with_astcompiler
 
 class TestStdlib:
diff --git a/pypy/interpreter/astcompiler/test/test_astbuilder.py b/pypy/interpreter/astcompiler/test/test_astbuilder.py
--- a/pypy/interpreter/astcompiler/test/test_astbuilder.py
+++ b/pypy/interpreter/astcompiler/test/test_astbuilder.py
@@ -2,7 +2,7 @@
 import random
 import string
 import sys
-import py
+import pypy._py as py
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.pyparser import pyparse
 from pypy.interpreter.pyparser.error import SyntaxError
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1,4 +1,4 @@
-import py, sys
+import pypy._py as py, sys
 from pypy.interpreter.astcompiler import codegen, astbuilder, symtable, optimize
 from pypy.interpreter.pyparser import pyparse
 from pypy.interpreter.pyparser.test import expressions
diff --git a/pypy/interpreter/astcompiler/test/test_symtable.py b/pypy/interpreter/astcompiler/test/test_symtable.py
--- a/pypy/interpreter/astcompiler/test/test_symtable.py
+++ b/pypy/interpreter/astcompiler/test/test_symtable.py
@@ -1,5 +1,5 @@
 import string
-import py
+import pypy._py as py
 from pypy.interpreter.astcompiler import ast, astbuilder, symtable, consts
 from pypy.interpreter.pyparser import pyparse
 from pypy.interpreter.pyparser.error import SyntaxError
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1535,7 +1535,7 @@
         """ NOT_RPYTHON """
         space = cache.space
         # XXX will change once we have our own compiler
-        import py
+        import pypy._py as py
         source = source.lstrip()
         assert source.startswith('('), "incorrect header in:\n%s" % (source,)
         source = py.code.Source("def anonymous%s\n" % source)
diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
--- a/pypy/interpreter/gateway.py
+++ b/pypy/interpreter/gateway.py
@@ -14,7 +14,7 @@
 import types
 import inspect
 
-import py
+import pypy._py as py
 
 from pypy.interpreter.eval import Code
 from pypy.interpreter.argument import Arguments
diff --git a/pypy/interpreter/pyparser/test/test_future.py b/pypy/interpreter/pyparser/test/test_future.py
--- a/pypy/interpreter/pyparser/test/test_future.py
+++ b/pypy/interpreter/pyparser/test/test_future.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.interpreter.pyparser import future, pytokenizer
 from pypy.tool import stdlib___future__ as fut
 
diff --git a/pypy/interpreter/pyparser/test/test_metaparser.py b/pypy/interpreter/pyparser/test/test_metaparser.py
--- a/pypy/interpreter/pyparser/test/test_metaparser.py
+++ b/pypy/interpreter/pyparser/test/test_metaparser.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import os
 import glob
 import tokenize
diff --git a/pypy/interpreter/pyparser/test/test_parser.py b/pypy/interpreter/pyparser/test/test_parser.py
--- a/pypy/interpreter/pyparser/test/test_parser.py
+++ b/pypy/interpreter/pyparser/test/test_parser.py
@@ -1,5 +1,5 @@
 # New parser tests.
-import py
+import pypy._py as py
 import tokenize
 import token
 import StringIO
diff --git a/pypy/interpreter/pyparser/test/test_parsestring.py b/pypy/interpreter/pyparser/test/test_parsestring.py
--- a/pypy/interpreter/pyparser/test/test_parsestring.py
+++ b/pypy/interpreter/pyparser/test/test_parsestring.py
@@ -1,5 +1,5 @@
 from pypy.interpreter.pyparser import parsestring
-import py, sys
+import pypy._py as py, sys
 
 class TestParsetring:
     def parse_and_compare(self, literal, value, encoding=None):
diff --git a/pypy/interpreter/pyparser/test/test_pyparse.py b/pypy/interpreter/pyparser/test/test_pyparse.py
--- a/pypy/interpreter/pyparser/test/test_pyparse.py
+++ b/pypy/interpreter/pyparser/test/test_pyparse.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import py
+import pypy._py as py
 from pypy.interpreter.pyparser import pyparse
 from pypy.interpreter.pyparser.pygram import syms, tokens
 from pypy.interpreter.pyparser.error import SyntaxError, IndentationError
diff --git a/pypy/interpreter/test/test_app_main.py b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -2,7 +2,7 @@
 Tests for the entry point of pypy-c, app_main.py.
 """
 from __future__ import with_statement
-import py
+import pypy._py as py
 import sys, os, re, runpy, subprocess
 from rpython.tool.udir import udir
 from contextlib import contextmanager
diff --git a/pypy/interpreter/test/test_appinterp.py b/pypy/interpreter/test/test_appinterp.py
--- a/pypy/interpreter/test/test_appinterp.py
+++ b/pypy/interpreter/test/test_appinterp.py
@@ -1,5 +1,5 @@
 
-import py
+import pypy._py as py
 from pypy.interpreter.gateway import appdef, ApplevelClass, applevel_temp
 from pypy.interpreter.error import OperationError
 
diff --git a/pypy/interpreter/test/test_argument.py b/pypy/interpreter/test/test_argument.py
--- a/pypy/interpreter/test/test_argument.py
+++ b/pypy/interpreter/test/test_argument.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import py
+import pypy._py as py
 from pypy.interpreter.argument import (Arguments, ArgErr, ArgErrUnknownKwds,
         ArgErrMultipleValues, ArgErrCount)
 from pypy.interpreter.signature import Signature
diff --git a/pypy/interpreter/test/test_buffer.py b/pypy/interpreter/test/test_buffer.py
--- a/pypy/interpreter/test/test_buffer.py
+++ b/pypy/interpreter/test/test_buffer.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.interpreter.buffer import Buffer
 from rpython.tool.udir import udir
 
diff --git a/pypy/interpreter/test/test_code.py b/pypy/interpreter/test/test_code.py
--- a/pypy/interpreter/test/test_code.py
+++ b/pypy/interpreter/test/test_code.py
@@ -1,6 +1,6 @@
 from pypy.interpreter import gateway
 from pypy.interpreter.astcompiler import consts
-import py
+import pypy._py as py
 
 class AppTestCodeIntrospection:
     def setup_class(cls):
diff --git a/pypy/interpreter/test/test_compiler.py b/pypy/interpreter/test/test_compiler.py
--- a/pypy/interpreter/test/test_compiler.py
+++ b/pypy/interpreter/test/test_compiler.py
@@ -1,5 +1,5 @@
 import __future__
-import py, sys
+import pypy._py as py, sys
 from pypy.interpreter.pycompiler import PythonAstCompiler
 from pypy.interpreter.pycode import PyCode
 from pypy.interpreter.error import OperationError
diff --git a/pypy/interpreter/test/test_error.py b/pypy/interpreter/test/test_error.py
--- a/pypy/interpreter/test/test_error.py
+++ b/pypy/interpreter/test/test_error.py
@@ -1,4 +1,4 @@
-import py, os, errno
+import pypy._py as py, os, errno
 from pypy.interpreter.error import OperationError, operationerrfmt
 from pypy.interpreter.error import decompose_valuefmt, get_operrcls2
 from pypy.interpreter.error import wrap_oserror, new_exception_class
diff --git a/pypy/interpreter/test/test_executioncontext.py b/pypy/interpreter/test/test_executioncontext.py
--- a/pypy/interpreter/test/test_executioncontext.py
+++ b/pypy/interpreter/test/test_executioncontext.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.interpreter import executioncontext
 
 class Finished(Exception):
diff --git a/pypy/interpreter/test/test_gateway.py b/pypy/interpreter/test/test_gateway.py
--- a/pypy/interpreter/test/test_gateway.py
+++ b/pypy/interpreter/test/test_gateway.py
@@ -4,7 +4,7 @@
 from pypy.interpreter import gateway, argument
 from pypy.interpreter.gateway import ObjSpace, W_Root, WrappedDefault
 from pypy.interpreter.signature import Signature
-import py
+import pypy._py as py
 import sys
 
 class FakeFunc(object):
diff --git a/pypy/interpreter/test/test_interpreter.py b/pypy/interpreter/test/test_interpreter.py
--- a/pypy/interpreter/test/test_interpreter.py
+++ b/pypy/interpreter/test/test_interpreter.py
@@ -1,4 +1,4 @@
-import py 
+import pypy._py as py
 import sys
 from pypy.interpreter import gateway, module, error
 
diff --git a/pypy/interpreter/test/test_main.py b/pypy/interpreter/test/test_main.py
--- a/pypy/interpreter/test/test_main.py
+++ b/pypy/interpreter/test/test_main.py
@@ -1,6 +1,6 @@
 from cStringIO import StringIO
 
-import py
+import pypy._py as py
 from rpython.tool.udir import udir
 from pypy.interpreter.baseobjspace import OperationError
 from pypy.interpreter import main
diff --git a/pypy/interpreter/test/test_mixedmodule.py b/pypy/interpreter/test/test_mixedmodule.py
--- a/pypy/interpreter/test/test_mixedmodule.py
+++ b/pypy/interpreter/test/test_mixedmodule.py
@@ -1,5 +1,5 @@
 from pypy.interpreter.mixedmodule import MixedModule
-import py.test
+import pypy._py as py
 
 
 class TestMixedModule(object):
diff --git a/pypy/interpreter/test/test_raise.py b/pypy/interpreter/test/test_raise.py
--- a/pypy/interpreter/test/test_raise.py
+++ b/pypy/interpreter/test/test_raise.py
@@ -1,4 +1,4 @@
-import py.test
+import pypy._py as py
 
 class AppTestRaise:
     def test_arg_as_string(self):
diff --git a/pypy/interpreter/test/test_syntax.py b/pypy/interpreter/test/test_syntax.py
--- a/pypy/interpreter/test/test_syntax.py
+++ b/pypy/interpreter/test/test_syntax.py
@@ -1,5 +1,5 @@
 from __future__ import with_statement
-import py
+import pypy._py as py
 
 def splitcases(s):
     lines = [line.rstrip() for line in s.split('\n')]
diff --git a/pypy/interpreter/test/test_zpy.py b/pypy/interpreter/test/test_zpy.py
--- a/pypy/interpreter/test/test_zpy.py
+++ b/pypy/interpreter/test/test_zpy.py
@@ -1,6 +1,6 @@
 
 from rpython.tool.udir import udir
-import py
+import pypy._py as py
 import sys
 import pypy
 import subprocess
diff --git a/pypy/interpreter/test/test_zzpickle_and_slow.py b/pypy/interpreter/test/test_zzpickle_and_slow.py
--- a/pypy/interpreter/test/test_zzpickle_and_slow.py
+++ b/pypy/interpreter/test/test_zzpickle_and_slow.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy import conftest
 from pypy.interpreter import gateway
 from rpython.rlib.jit import non_virtual_ref, vref_None
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.interpreter.argument import Arguments
 from pypy.interpreter.baseobjspace import W_Root, DescrMismatch
diff --git a/pypy/module/__builtin__/test/test_classobj.py b/pypy/module/__builtin__/test/test_classobj.py
--- a/pypy/module/__builtin__/test/test_classobj.py
+++ b/pypy/module/__builtin__/test/test_classobj.py
@@ -1,5 +1,5 @@
 from __future__ import with_statement
-import py
+import pypy._py as py
 from pypy.interpreter import gateway
 
 
diff --git a/pypy/module/__pypy__/test/test_debug.py b/pypy/module/__pypy__/test/test_debug.py
--- a/pypy/module/__pypy__/test/test_debug.py
+++ b/pypy/module/__pypy__/test/test_debug.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.interpreter.gateway import interp2app
 from rpython.rlib import debug
diff --git a/pypy/module/__pypy__/test/test_signal.py b/pypy/module/__pypy__/test/test_signal.py
--- a/pypy/module/__pypy__/test/test_signal.py
+++ b/pypy/module/__pypy__/test/test_signal.py
@@ -105,7 +105,7 @@
     def setup_class(cls):
         if (not cls.runappdirect or
                 '__pypy__' not in sys.builtin_module_names):
-            import py
+            import pypy._py as py
             py.test.skip("this is only a test for -A runs on top of pypy")
 
     def test_enable_signals(self):
diff --git a/pypy/module/__pypy__/test/test_special.py b/pypy/module/__pypy__/test/test_special.py
--- a/pypy/module/__pypy__/test/test_special.py
+++ b/pypy/module/__pypy__/test/test_special.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 class AppTest(object):
     spaceconfig = {"objspace.usemodules.select": False,
diff --git a/pypy/module/__pypy__/test/test_time.py b/pypy/module/__pypy__/test/test_time.py
--- a/pypy/module/__pypy__/test/test_time.py
+++ b/pypy/module/__pypy__/test/test_time.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.module.__pypy__.interp_time import HAS_CLOCK_GETTIME
 
diff --git a/pypy/module/_ast/test/test_ast.py b/pypy/module/_ast/test/test_ast.py
--- a/pypy/module/_ast/test/test_ast.py
+++ b/pypy/module/_ast/test/test_ast.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 
 class AppTestAST:
diff --git a/pypy/module/_cffi_backend/test/test_c.py b/pypy/module/_cffi_backend/test/test_c.py
--- a/pypy/module/_cffi_backend/test/test_c.py
+++ b/pypy/module/_cffi_backend/test/test_c.py
@@ -15,7 +15,7 @@
    - if you could complete step 3, try running 'py.test test_file.py' here
 5. make the test pass in pypy ('py.test test_c.py')
 """
-import py, sys, ctypes
+import pypy._py as py, sys, ctypes
 if sys.version_info < (2, 6):
     py.test.skip("requires the b'' literal syntax")
 
diff --git a/pypy/module/_cffi_backend/test/test_file.py b/pypy/module/_cffi_backend/test/test_file.py
--- a/pypy/module/_cffi_backend/test/test_file.py
+++ b/pypy/module/_cffi_backend/test/test_file.py
@@ -1,4 +1,4 @@
-import urllib2, py
+import urllib2, pypy._py as py
 
 
 def test_same_file():
diff --git a/pypy/module/_continuation/test/support.py b/pypy/module/_continuation/test/support.py
--- a/pypy/module/_continuation/test/support.py
+++ b/pypy/module/_continuation/test/support.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from rpython.rtyper.tool.rffi_platform import CompilationError
 
 
diff --git a/pypy/module/_continuation/test/test_translated.py b/pypy/module/_continuation/test/test_translated.py
--- a/pypy/module/_continuation/test/test_translated.py
+++ b/pypy/module/_continuation/test/test_translated.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 try:
     import _continuation
 except ImportError:
diff --git a/pypy/module/_file/interp_file.py b/pypy/module/_file/interp_file.py
--- a/pypy/module/_file/interp_file.py
+++ b/pypy/module/_file/interp_file.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import os
 import stat
 import errno
diff --git a/pypy/module/_file/interp_stream.py b/pypy/module/_file/interp_stream.py
--- a/pypy/module/_file/interp_stream.py
+++ b/pypy/module/_file/interp_stream.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from rpython.rlib import streamio
 from rpython.rlib.streamio import StreamErrors
diff --git a/pypy/module/_file/test/test_file.py b/pypy/module/_file/test/test_file.py
--- a/pypy/module/_file/test/test_file.py
+++ b/pypy/module/_file/test/test_file.py
@@ -1,5 +1,5 @@
 from __future__ import with_statement
-import py, os, errno
+import pypy._py as py, os, errno
 
 def getfile(space):
     return space.appexec([], """():
diff --git a/pypy/module/_file/test/test_file_extra.py b/pypy/module/_file/test/test_file_extra.py
--- a/pypy/module/_file/test/test_file_extra.py
+++ b/pypy/module/_file/test/test_file_extra.py
@@ -1,6 +1,6 @@
 import os, random, sys
 import rpython.tool.udir
-import py
+import pypy._py as py
 
 udir = rpython.tool.udir.udir.ensure('test_file_extra', dir=1)
 
diff --git a/pypy/module/_file/test/test_large_file.py b/pypy/module/_file/test/test_large_file.py
--- a/pypy/module/_file/test/test_large_file.py
+++ b/pypy/module/_file/test/test_large_file.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.module._file.test.test_file import getfile
 
diff --git a/pypy/module/_io/test/test_bufferedio.py b/pypy/module/_io/test/test_bufferedio.py
--- a/pypy/module/_io/test/test_bufferedio.py
+++ b/pypy/module/_io/test/test_bufferedio.py
@@ -3,7 +3,7 @@
 from rpython.tool.udir import udir
 from pypy.module._io import interp_bufferedio
 from pypy.interpreter.error import OperationError
-import py.test
+import pypy._py as py
 
 class AppTestBufferedReader:
     spaceconfig = dict(usemodules=['_io'])
diff --git a/pypy/module/_locale/test/test_locale.py b/pypy/module/_locale/test/test_locale.py
--- a/pypy/module/_locale/test/test_locale.py
+++ b/pypy/module/_locale/test/test_locale.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 import sys
 
diff --git a/pypy/module/_lsprof/interp_lsprof.py b/pypy/module/_lsprof/interp_lsprof.py
--- a/pypy/module/_lsprof/interp_lsprof.py
+++ b/pypy/module/_lsprof/interp_lsprof.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError
diff --git a/pypy/module/_minimal_curses/__init__.py b/pypy/module/_minimal_curses/__init__.py
--- a/pypy/module/_minimal_curses/__init__.py
+++ b/pypy/module/_minimal_curses/__init__.py
@@ -6,7 +6,7 @@
         # we prefer _curses so any constants added make it into _minimal_curses
         import _minimal_curses as _curses
     except ImportError:
-        import py
+        import pypy._py as py
         py.test.skip("no _curses or _minimal_curses module")  # no _curses at all
 
 from pypy.interpreter.mixedmodule import MixedModule
diff --git a/pypy/module/_minimal_curses/test/test_curses.py b/pypy/module/_minimal_curses/test/test_curses.py
--- a/pypy/module/_minimal_curses/test/test_curses.py
+++ b/pypy/module/_minimal_curses/test/test_curses.py
@@ -1,6 +1,6 @@
 from pypy.conftest import pypydir
 from rpython.tool.udir import udir
-import py
+import pypy._py as py
 import sys
 # tests here are run as snippets through a pexpected python subprocess
 
diff --git a/pypy/module/_multibytecodec/c_codecs.py b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_codecs.py
+++ b/pypy/module/_multibytecodec/c_codecs.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from rpython.conftest import cdir
diff --git a/pypy/module/_multibytecodec/test/test_c_codecs.py b/pypy/module/_multibytecodec/test/test_c_codecs.py
--- a/pypy/module/_multibytecodec/test/test_c_codecs.py
+++ b/pypy/module/_multibytecodec/test/test_c_codecs.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module._multibytecodec.c_codecs import getcodec, codecs
 from pypy.module._multibytecodec.c_codecs import decode, encode
 from pypy.module._multibytecodec.c_codecs import EncodeDecodeError
diff --git a/pypy/module/_multiprocessing/test/test_connection.py b/pypy/module/_multiprocessing/test/test_connection.py
--- a/pypy/module/_multiprocessing/test/test_connection.py
+++ b/pypy/module/_multiprocessing/test/test_connection.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys
 from pypy.interpreter.gateway import interp2app, W_Root
 
diff --git a/pypy/module/_multiprocessing/test/test_win32.py b/pypy/module/_multiprocessing/test/test_win32.py
--- a/pypy/module/_multiprocessing/test/test_win32.py
+++ b/pypy/module/_multiprocessing/test/test_win32.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys
 
 class AppTestWin32:
diff --git a/pypy/module/_pypyjson/targetjson.py b/pypy/module/_pypyjson/targetjson.py
--- a/pypy/module/_pypyjson/targetjson.py
+++ b/pypy/module/_pypyjson/targetjson.py
@@ -1,5 +1,5 @@
 import sys
-import py
+import pypy._py as py
 ROOT = py.path.local(__file__).dirpath('..', '..', '..')
 sys.path.insert(0, str(ROOT))
 
diff --git a/pypy/module/_rawffi/alt/test/test_funcptr.py b/pypy/module/_rawffi/alt/test/test_funcptr.py
--- a/pypy/module/_rawffi/alt/test/test_funcptr.py
+++ b/pypy/module/_rawffi/alt/test/test_funcptr.py
@@ -4,7 +4,7 @@
 from rpython.rlib.libffi import CDLL
 from rpython.rlib.test.test_clibffi import get_libm_name
 
-import sys, py
+import sys, pypy._py as py
 
 class BaseAppTestFFI(object):
     spaceconfig = dict(usemodules=('_rawffi',))
diff --git a/pypy/module/_rawffi/test/test__rawffi.py b/pypy/module/_rawffi/test/test__rawffi.py
--- a/pypy/module/_rawffi/test/test__rawffi.py
+++ b/pypy/module/_rawffi/test/test__rawffi.py
@@ -3,7 +3,7 @@
 from pypy.module._rawffi.interp_rawffi import TYPEMAP, TYPEMAP_FLOAT_LETTERS
 from pypy.module._rawffi.tracker import Tracker
 
-import os, sys, py
+import os, sys, pypy._py as py
 
 class AppTestFfi:
     spaceconfig = dict(usemodules=['_rawffi', 'struct'])
diff --git a/pypy/module/_rawffi/test/test_tracker.py b/pypy/module/_rawffi/test/test_tracker.py
--- a/pypy/module/_rawffi/test/test_tracker.py
+++ b/pypy/module/_rawffi/test/test_tracker.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.conftest import option
 from pypy.module._rawffi.tracker import Tracker
 
diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -1,5 +1,5 @@
 import sys
-import py
+import pypy._py as py
 from pypy.tool.pytest.objspace import gettestobjspace
 from rpython.tool.udir import udir
 from rpython.rlib import rsocket
diff --git a/pypy/module/_sre/test/test_app_sre.py b/pypy/module/_sre/test/test_app_sre.py
--- a/pypy/module/_sre/test/test_app_sre.py
+++ b/pypy/module/_sre/test/test_app_sre.py
@@ -1,6 +1,6 @@
 """Regular expression tests specific to _sre.py and accumulated during TDD."""
 import os
-import py
+import pypy._py as py
 from py.test import raises, skip
 from pypy.interpreter.gateway import app2interp_temp
 
diff --git a/pypy/module/_weakref/interp__weakref.py b/pypy/module/_weakref/interp__weakref.py
--- a/pypy/module/_weakref/interp__weakref.py
+++ b/pypy/module/_weakref/interp__weakref.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.gateway import interp2app, ObjSpace
diff --git a/pypy/module/_winreg/test/test_winreg.py b/pypy/module/_winreg/test/test_winreg.py
--- a/pypy/module/_winreg/test/test_winreg.py
+++ b/pypy/module/_winreg/test/test_winreg.py
@@ -1,6 +1,6 @@
 from rpython.tool.udir import udir
 
-import os, sys, py
+import os, sys, pypy._py as py
 
 if sys.platform != 'win32':
     py.test.skip("_winreg is a win32 module")
diff --git a/pypy/module/array/test/test_array.py b/pypy/module/array/test/test_array.py
--- a/pypy/module/array/test/test_array.py
+++ b/pypy/module/array/test/test_array.py
@@ -1,6 +1,5 @@
 import sys
-import py
-import py.test
+import pypy._py as py
 
 
 ## class AppTestSimpleArray:
diff --git a/pypy/module/array/test/test_array_old.py b/pypy/module/array/test/test_array_old.py
--- a/pypy/module/array/test/test_array_old.py
+++ b/pypy/module/array/test/test_array_old.py
@@ -1,6 +1,6 @@
 # minimal tests.  See also lib-python/modified-2.4.1/test/test_array.
 
-import py
+import pypy._py as py
 from py.test import raises
 import struct
 
diff --git a/pypy/module/bz2/test/test_bz2_compdecomp.py b/pypy/module/bz2/test/test_bz2_compdecomp.py
--- a/pypy/module/bz2/test/test_bz2_compdecomp.py
+++ b/pypy/module/bz2/test/test_bz2_compdecomp.py
@@ -1,6 +1,6 @@
 import os
 
-import py
+import pypy._py as py
 
 from pypy.interpreter.gateway import interp2app
 from pypy.module.bz2.test.support import CheckAllocation
diff --git a/pypy/module/bz2/test/test_bz2_file.py b/pypy/module/bz2/test/test_bz2_file.py
--- a/pypy/module/bz2/test/test_bz2_file.py
+++ b/pypy/module/bz2/test/test_bz2_file.py
@@ -3,7 +3,7 @@
 import os
 import random
 
-import py
+import pypy._py as py
 
 from pypy.interpreter.gateway import unwrap_spec, interp2app
 from pypy.module.bz2.test.support import CheckAllocation
diff --git a/pypy/module/bz2/test/test_large.py b/pypy/module/bz2/test/test_large.py
--- a/pypy/module/bz2/test/test_large.py
+++ b/pypy/module/bz2/test/test_large.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 
 class AppTestBZ2File:
diff --git a/pypy/module/cStringIO/test/test_interp_stringio.py b/pypy/module/cStringIO/test/test_interp_stringio.py
--- a/pypy/module/cStringIO/test/test_interp_stringio.py
+++ b/pypy/module/cStringIO/test/test_interp_stringio.py
@@ -1,4 +1,4 @@
-import os, sys, py
+import os, sys, pypy._py as py
 
 
 class AppTestcStringIO:
diff --git a/pypy/module/cppyy/capi/cint_capi.py b/pypy/module/cppyy/capi/cint_capi.py
--- a/pypy/module/cppyy/capi/cint_capi.py
+++ b/pypy/module/cppyy/capi/cint_capi.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.gateway import interp2app, unwrap_spec
diff --git a/pypy/module/cppyy/capi/reflex_capi.py b/pypy/module/cppyy/capi/reflex_capi.py
--- a/pypy/module/cppyy/capi/reflex_capi.py
+++ b/pypy/module/cppyy/capi/reflex_capi.py
@@ -1,4 +1,4 @@
-import py, os
+import pypy._py as py, os
 
 from rpython.rlib import libffi
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/pypy/module/cppyy/test/conftest.py b/pypy/module/cppyy/test/conftest.py
--- a/pypy/module/cppyy/test/conftest.py
+++ b/pypy/module/cppyy/test/conftest.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 def pytest_runtest_setup(item):
     if py.path.local.sysfind('genreflex') is None:
diff --git a/pypy/module/cppyy/test/test_aclassloader.py b/pypy/module/cppyy/test/test_aclassloader.py
--- a/pypy/module/cppyy/test/test_aclassloader.py
+++ b/pypy/module/cppyy/test/test_aclassloader.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 
 currpath = py.path.local(__file__).dirpath()
diff --git a/pypy/module/cppyy/test/test_advancedcpp.py b/pypy/module/cppyy/test/test_advancedcpp.py
--- a/pypy/module/cppyy/test/test_advancedcpp.py
+++ b/pypy/module/cppyy/test/test_advancedcpp.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 from pypy.module.cppyy import capi
 
diff --git a/pypy/module/cppyy/test/test_cint.py b/pypy/module/cppyy/test/test_cint.py
--- a/pypy/module/cppyy/test/test_cint.py
+++ b/pypy/module/cppyy/test/test_cint.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 # These tests are for the CINT backend only (they exercise ROOT features
 # and classes that are not loaded/available with the Reflex backend). At
diff --git a/pypy/module/cppyy/test/test_cppyy.py b/pypy/module/cppyy/test/test_cppyy.py
--- a/pypy/module/cppyy/test/test_cppyy.py
+++ b/pypy/module/cppyy/test/test_cppyy.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 from pypy.module.cppyy import interp_cppyy, executor
 
 
diff --git a/pypy/module/cppyy/test/test_crossing.py b/pypy/module/cppyy/test/test_crossing.py
--- a/pypy/module/cppyy/test/test_crossing.py
+++ b/pypy/module/cppyy/test/test_crossing.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
 from rpython.translator import platform
diff --git a/pypy/module/cppyy/test/test_datatypes.py b/pypy/module/cppyy/test/test_datatypes.py
--- a/pypy/module/cppyy/test/test_datatypes.py
+++ b/pypy/module/cppyy/test/test_datatypes.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 
 currpath = py.path.local(__file__).dirpath()
diff --git a/pypy/module/cppyy/test/test_fragile.py b/pypy/module/cppyy/test/test_fragile.py
--- a/pypy/module/cppyy/test/test_fragile.py
+++ b/pypy/module/cppyy/test/test_fragile.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 from pypy.module.cppyy import capi
 
 currpath = py.path.local(__file__).dirpath()
diff --git a/pypy/module/cppyy/test/test_operators.py b/pypy/module/cppyy/test/test_operators.py
--- a/pypy/module/cppyy/test/test_operators.py
+++ b/pypy/module/cppyy/test/test_operators.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 
 currpath = py.path.local(__file__).dirpath()
diff --git a/pypy/module/cppyy/test/test_overloads.py b/pypy/module/cppyy/test/test_overloads.py
--- a/pypy/module/cppyy/test/test_overloads.py
+++ b/pypy/module/cppyy/test/test_overloads.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 
 currpath = py.path.local(__file__).dirpath()
diff --git a/pypy/module/cppyy/test/test_pythonify.py b/pypy/module/cppyy/test/test_pythonify.py
--- a/pypy/module/cppyy/test/test_pythonify.py
+++ b/pypy/module/cppyy/test/test_pythonify.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 from pypy.module.cppyy import interp_cppyy, executor
 
 
diff --git a/pypy/module/cppyy/test/test_stltypes.py b/pypy/module/cppyy/test/test_stltypes.py
--- a/pypy/module/cppyy/test/test_stltypes.py
+++ b/pypy/module/cppyy/test/test_stltypes.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 
 currpath = py.path.local(__file__).dirpath()
diff --git a/pypy/module/cppyy/test/test_streams.py b/pypy/module/cppyy/test/test_streams.py
--- a/pypy/module/cppyy/test/test_streams.py
+++ b/pypy/module/cppyy/test/test_streams.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 
 
 currpath = py.path.local(__file__).dirpath()
diff --git a/pypy/module/cppyy/test/test_zjit.py b/pypy/module/cppyy/test/test_zjit.py
--- a/pypy/module/cppyy/test/test_zjit.py
+++ b/pypy/module/cppyy/test/test_zjit.py
@@ -1,4 +1,4 @@
-import py, os, sys
+import pypy._py as py, os, sys
 from rpython.jit.metainterp.test.support import LLJitMixin
 from rpython.rlib.objectmodel import specialize, instantiate
 from rpython.rlib import rarithmetic, jit
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -2,7 +2,7 @@
 import sys, os
 import atexit
 
-import py
+import pypy._py as py
 
 from pypy.conftest import pypydir
 from rpython.rtyper.lltypesystem import rffi, lltype
diff --git a/pypy/module/cpyext/test/conftest.py b/pypy/module/cpyext/test/conftest.py
--- a/pypy/module/cpyext/test/conftest.py
+++ b/pypy/module/cpyext/test/conftest.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import pytest
 
 def pytest_configure(config):
diff --git a/pypy/module/cpyext/test/test_api.py b/pypy/module/cpyext/test/test_api.py
--- a/pypy/module/cpyext/test/test_api.py
+++ b/pypy/module/cpyext/test/test_api.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from rpython.rtyper.lltypesystem import rffi, lltype
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.module.cpyext.state import State
diff --git a/pypy/module/cpyext/test/test_arraymodule.py b/pypy/module/cpyext/test/test_arraymodule.py
--- a/pypy/module/cpyext/test/test_arraymodule.py
+++ b/pypy/module/cpyext/test/test_arraymodule.py
@@ -1,6 +1,6 @@
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
 
-import py
+import pypy._py as py
 import sys
 
 class AppTestArrayModule(AppTestCpythonExtensionBase):
diff --git a/pypy/module/cpyext/test/test_borrow.py b/pypy/module/cpyext/test/test_borrow.py
--- a/pypy/module/cpyext/test/test_borrow.py
+++ b/pypy/module/cpyext/test/test_borrow.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from pypy.module.cpyext.pyobject import make_ref, borrow_from, RefcountState
diff --git a/pypy/module/cpyext/test/test_cpyext.py b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -2,7 +2,7 @@
 import weakref
 import os
 
-import py
+import pypy._py as py
 
 from pypy.conftest import pypydir
 from pypy.interpreter.error import OperationError
diff --git a/pypy/module/cpyext/test/test_longobject.py b/pypy/module/cpyext/test/test_longobject.py
--- a/pypy/module/cpyext/test/test_longobject.py
+++ b/pypy/module/cpyext/test/test_longobject.py
@@ -1,4 +1,4 @@
-import sys, py
+import sys, pypy._py as py
 from rpython.rtyper.lltypesystem import rffi, lltype
 from pypy.objspace.std.intobject import W_IntObject
 from pypy.objspace.std.longobject import W_LongObject
diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py
--- a/pypy/module/cpyext/test/test_memoryobject.py
+++ b/pypy/module/cpyext/test/test_memoryobject.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.cpyext.test.test_api import BaseApiTest
 
 class TestMemoryViewObject(BaseApiTest):
diff --git a/pypy/module/cpyext/test/test_object.py b/pypy/module/cpyext/test/test_object.py
--- a/pypy/module/cpyext/test/test_object.py
+++ b/pypy/module/cpyext/test/test_object.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
diff --git a/pypy/module/cpyext/test/test_sequence.py b/pypy/module/cpyext/test/test_sequence.py
--- a/pypy/module/cpyext/test/test_sequence.py
+++ b/pypy/module/cpyext/test/test_sequence.py
@@ -2,7 +2,7 @@
 from pypy.interpreter.error import OperationError
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from pypy.module.cpyext import sequence
-import py.test
+import pypy._py as py
 
 class TestSequence(BaseApiTest):
     def test_sequence(self, space, api):
diff --git a/pypy/module/cpyext/test/test_setobject.py b/pypy/module/cpyext/test/test_setobject.py
--- a/pypy/module/cpyext/test/test_setobject.py
+++ b/pypy/module/cpyext/test/test_setobject.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.module.cpyext.pyobject import PyObject, PyObjectP, make_ref, from_ref
 from pypy.module.cpyext.test.test_api import BaseApiTest
diff --git a/pypy/module/cpyext/test/test_stringobject.py b/pypy/module/cpyext/test/test_stringobject.py
--- a/pypy/module/cpyext/test/test_stringobject.py
+++ b/pypy/module/cpyext/test/test_stringobject.py
@@ -5,7 +5,7 @@
 from pypy.module.cpyext.api import PyObjectP, PyObject, Py_ssize_tP
 from pypy.module.cpyext.pyobject import Py_DecRef, from_ref, make_ref
 
-import py
+import pypy._py as py
 import sys
 
 class AppTestStringObject(AppTestCpythonExtensionBase):
diff --git a/pypy/module/cpyext/test/test_thread.py b/pypy/module/cpyext/test/test_thread.py
--- a/pypy/module/cpyext/test/test_thread.py
+++ b/pypy/module/cpyext/test/test_thread.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
 
diff --git a/pypy/module/cpyext/test/test_tupleobject.py b/pypy/module/cpyext/test/test_tupleobject.py
--- a/pypy/module/cpyext/test/test_tupleobject.py
+++ b/pypy/module/cpyext/test/test_tupleobject.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 from pypy.module.cpyext.pyobject import PyObject, PyObjectP, make_ref, from_ref
 from pypy.module.cpyext.test.test_api import BaseApiTest
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -4,7 +4,7 @@
 from pypy.module.cpyext.pyobject import PyObject, make_ref, from_ref
 from pypy.module.cpyext.typeobject import PyTypeObjectPtr
 
-import py
+import pypy._py as py
 import sys
 
 class AppTestTypeObject(AppTestCpythonExtensionBase):
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py b/pypy/module/cpyext/test/test_unicodeobject.py
--- a/pypy/module/cpyext/test/test_unicodeobject.py
+++ b/pypy/module/cpyext/test/test_unicodeobject.py
@@ -6,7 +6,7 @@
 from pypy.module.cpyext.api import PyObjectP, PyObject
 from pypy.module.cpyext.pyobject import Py_DecRef, from_ref
 from rpython.rtyper.lltypesystem import rffi, lltype
-import sys, py
+import sys, pypy._py as py
 
 class AppTestUnicodeObject(AppTestCpythonExtensionBase):
     def test_unicodeobject(self):
diff --git a/pypy/module/crypt/test/test_crypt.py b/pypy/module/crypt/test/test_crypt.py
--- a/pypy/module/crypt/test/test_crypt.py
+++ b/pypy/module/crypt/test/test_crypt.py
@@ -1,5 +1,5 @@
 import os
-import py
+import pypy._py as py
 
 if os.name != 'posix':
     py.test.skip('crypt module only available on unix')
diff --git a/pypy/module/fcntl/test/test_fcntl.py b/pypy/module/fcntl/test/test_fcntl.py
--- a/pypy/module/fcntl/test/test_fcntl.py
+++ b/pypy/module/fcntl/test/test_fcntl.py
@@ -1,5 +1,5 @@
 import os
-import py
+import pypy._py as py
 from rpython.tool.udir import udir
 
 if os.name != 'posix':
diff --git a/pypy/module/gc/test/test_app_referents.py b/pypy/module/gc/test/test_app_referents.py
--- a/pypy/module/gc/test/test_app_referents.py
+++ b/pypy/module/gc/test/test_app_referents.py
@@ -1,4 +1,4 @@
-import py, os
+import pypy._py as py, os
 from rpython.tool.udir import udir
 
 
diff --git a/pypy/module/gc/test/test_gc.py b/pypy/module/gc/test/test_gc.py
--- a/pypy/module/gc/test/test_gc.py
+++ b/pypy/module/gc/test/test_gc.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 class AppTestGC(object):
     def test_collect(self):
@@ -73,7 +73,7 @@
     pytestmark = py.test.mark.xfail(run=False)
 
     def setup_class(cls):
-        import py
+        import pypy._py as py
         from rpython.tool.udir import udir
         from rpython.rlib import rgc
         class X(object):
@@ -92,7 +92,7 @@
         cls._fname = fname
 
     def teardown_class(cls):
-        import py
+        import pypy._py as py
         from rpython.rlib import rgc
         
         rgc._heap_stats = cls._heap_stats
diff --git a/pypy/module/imp/test/test_import.py b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.interpreter.module import Module
 from pypy.interpreter import gateway
 from pypy.interpreter.error import OperationError
diff --git a/pypy/module/itertools/test/test_itertools.py b/pypy/module/itertools/test/test_itertools.py
--- a/pypy/module/itertools/test/test_itertools.py
+++ b/pypy/module/itertools/test/test_itertools.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 
 class AppTestItertools: 
diff --git a/pypy/module/math/test/test_direct.py b/pypy/module/math/test/test_direct.py
--- a/pypy/module/math/test/test_direct.py
+++ b/pypy/module/math/test/test_direct.py
@@ -1,7 +1,7 @@
 """ Try to test systematically all cases of the math module.
 """
 
-import py, sys, math
+import pypy._py as py, sys, math
 from rpython.rlib import rfloat
 from rpython.rtyper.lltypesystem.module.test.math_cases import (MathTests,
                                                                 get_tester)
diff --git a/pypy/module/math/test/test_factorial.py b/pypy/module/math/test/test_factorial.py
--- a/pypy/module/math/test/test_factorial.py
+++ b/pypy/module/math/test/test_factorial.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import math
 from pypy.module.math import app_math
 
diff --git a/pypy/module/micronumpy/test/test_compile.py b/pypy/module/micronumpy/test/test_compile.py
--- a/pypy/module/micronumpy/test/test_compile.py
+++ b/pypy/module/micronumpy/test/test_compile.py
@@ -1,5 +1,5 @@
 
-import py
+import pypy._py as py
 from pypy.module.micronumpy.compile import (numpy_compile, Assignment,
     ArrayConstant, FloatConstant, Operator, Variable, RangeConstant, Execute,
     FunctionCall, FakeSpace, W_NDimArray)
diff --git a/pypy/module/micronumpy/test/test_dtypes.py b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -1,4 +1,4 @@
-import py, sys
+import pypy._py as py, sys
 from pypy.conftest import option
 from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
 from pypy.interpreter.gateway import interp2app
diff --git a/pypy/module/micronumpy/test/test_numarray.py b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys
 
 from pypy.conftest import option
diff --git a/pypy/module/micronumpy/test/test_outarg.py b/pypy/module/micronumpy/test/test_outarg.py
--- a/pypy/module/micronumpy/test/test_outarg.py
+++ b/pypy/module/micronumpy/test/test_outarg.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
 
 class AppTestOutArg(BaseNumpyAppTest):
diff --git a/pypy/module/micronumpy/test/test_subtype.py b/pypy/module/micronumpy/test/test_subtype.py
--- a/pypy/module/micronumpy/test/test_subtype.py
+++ b/pypy/module/micronumpy/test/test_subtype.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
 
 
diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py
--- a/pypy/module/micronumpy/test/test_zjit.py
+++ b/pypy/module/micronumpy/test/test_zjit.py
@@ -3,7 +3,7 @@
 good assembler
 """
 
-import py
+import pypy._py as py
 from rpython.jit.metainterp import pyjitpl
 from rpython.jit.metainterp.test.support import LLJitMixin
 from rpython.jit.metainterp.warmspot import reset_jit, get_stats
diff --git a/pypy/module/oracle/roci.py b/pypy/module/oracle/roci.py
--- a/pypy/module/oracle/roci.py
+++ b/pypy/module/oracle/roci.py
@@ -3,7 +3,7 @@
 from rpython.rtyper.lltypesystem import rffi, lltype
 from pypy.conftest import option
 import sys, os
-import py
+import pypy._py as py
 
 oracle_home = getattr(option, 'oracle_home',
                       os.environ.get("ORACLE_HOME"))
diff --git a/pypy/module/oracle/test/conftest.py b/pypy/module/oracle/test/conftest.py
--- a/pypy/module/oracle/test/conftest.py
+++ b/pypy/module/oracle/test/conftest.py
@@ -1,3 +1,3 @@
-import py
+import pypy._py as py
 def pytest_runtest_setup():
     py.test.importorskip("pypy.module.oracle.roci")
diff --git a/pypy/module/oracle/test/test_connect.py b/pypy/module/oracle/test/test_connect.py
--- a/pypy/module/oracle/test/test_connect.py
+++ b/pypy/module/oracle/test/test_connect.py
@@ -1,6 +1,6 @@
 from pypy.conftest import option
 from rpython.rtyper.tool.rffi_platform import CompilationError
-import py
+import pypy._py as py
 
 class OracleNotConnectedTestBase(object):
     spaceconfig = dict(usemodules=('oracle',))
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -9,7 +9,7 @@
 from rpython.rtyper.module.ll_os import RegisterOs
 from rpython.translator.c.test.test_extfunc import need_sparse_files
 import os
-import py
+import pypy._py as py
 import sys
 import signal
 
diff --git a/pypy/module/pwd/test/test_pwd.py b/pypy/module/pwd/test/test_pwd.py
--- a/pypy/module/pwd/test/test_pwd.py
+++ b/pypy/module/pwd/test/test_pwd.py
@@ -1,5 +1,5 @@
 import os
-import py
+import pypy._py as py
 
 if os.name != 'posix':
     py.test.skip('pwd module only available on unix')
diff --git a/pypy/module/pyexpat/interp_pyexpat.py b/pypy/module/pyexpat/interp_pyexpat.py
--- a/pypy/module/pyexpat/interp_pyexpat.py
+++ b/pypy/module/pyexpat/interp_pyexpat.py
@@ -10,7 +10,7 @@
 
 import sys
 import weakref
-import py
+import pypy._py as py
 
 if sys.platform == "win32":
     libname = 'libexpat'
diff --git a/pypy/module/pyexpat/test/test_build.py b/pypy/module/pyexpat/test/test_build.py
--- a/pypy/module/pyexpat/test/test_build.py
+++ b/pypy/module/pyexpat/test/test_build.py
@@ -5,7 +5,7 @@
 from rpython.rtyper.tool.rffi_platform import CompilationError
 
 import os
-import py
+import pypy._py as py
 try:
     import pyexpat
 except ImportError:
diff --git a/pypy/module/pypyjit/test/test_jit_hook.py b/pypy/module/pypyjit/test/test_jit_hook.py
--- a/pypy/module/pypyjit/test/test_jit_hook.py
+++ b/pypy/module/pypyjit/test/test_jit_hook.py
@@ -1,5 +1,5 @@
 
-import py
+import pypy._py as py
 from pypy.interpreter.gateway import interp2app
 from pypy.interpreter.pycode import PyCode
 from rpython.jit.metainterp.history import JitCellToken, ConstInt, ConstPtr,\
diff --git a/pypy/module/pypyjit/test/test_pyframe.py b/pypy/module/pypyjit/test/test_pyframe.py
--- a/pypy/module/pypyjit/test/test_pyframe.py
+++ b/pypy/module/pypyjit/test/test_pyframe.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 
 class TestJitTraceInteraction(object):
diff --git a/pypy/module/pypyjit/test_pypy_c/model.py b/pypy/module/pypyjit/test_pypy_c/model.py
--- a/pypy/module/pypyjit/test_pypy_c/model.py
+++ b/pypy/module/pypyjit/test_pypy_c/model.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys
 import re
 import os.path
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -2,7 +2,7 @@
 import sys, os
 import types
 import subprocess
-import py
+import pypy._py as py
 from lib_pypy import disassembler
 from rpython.tool.udir import udir
 from rpython.tool import logparser
diff --git a/pypy/module/pypyjit/test_pypy_c/test_alloc.py b/pypy/module/pypyjit/test_pypy_c/test_alloc.py
--- a/pypy/module/pypyjit/test_pypy_c/test_alloc.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_alloc.py
@@ -1,4 +1,4 @@
-import py, sys
+import pypy._py as py, sys
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestAlloc(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_array.py b/pypy/module/pypyjit/test_pypy_c/test_array.py
--- a/pypy/module/pypyjit/test_pypy_c/test_array.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_array.py
@@ -1,4 +1,4 @@
-import py, sys
+import pypy._py as py, sys
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestArray(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_boolrewrite.py b/pypy/module/pypyjit/test_pypy_c/test_boolrewrite.py
--- a/pypy/module/pypyjit/test_pypy_c/test_boolrewrite.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_boolrewrite.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestBoolRewrite(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_bug.py b/pypy/module/pypyjit/test_pypy_c/test_bug.py
--- a/pypy/module/pypyjit/test_pypy_c/test_bug.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_bug.py
@@ -1,4 +1,4 @@
-import os, sys, py, subprocess
+import os, sys, pypy._py as py, subprocess
 
 localdir = os.path.dirname(os.path.abspath(__file__))
 
diff --git a/pypy/module/pypyjit/test_pypy_c/test_call.py b/pypy/module/pypyjit/test_pypy_c/test_call.py
--- a/pypy/module/pypyjit/test_pypy_c/test_call.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_call.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 from pypy.module.pypyjit.test_pypy_c.model import OpMatcher
 
diff --git a/pypy/module/pypyjit/test_pypy_c/test_exception.py b/pypy/module/pypyjit/test_pypy_c/test_exception.py
--- a/pypy/module/pypyjit/test_pypy_c/test_exception.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_exception.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestException(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
@@ -1,4 +1,4 @@
-import sys, py
+import sys, pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class Test__ffi(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_import.py b/pypy/module/pypyjit/test_pypy_c/test_import.py
--- a/pypy/module/pypyjit/test_pypy_c/test_import.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_import.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestImport(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_instance.py b/pypy/module/pypyjit/test_pypy_c/test_instance.py
--- a/pypy/module/pypyjit/test_pypy_c/test_instance.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_instance.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestInstance(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_intbound.py b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
--- a/pypy/module/pypyjit/test_pypy_c/test_intbound.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestIntbound(BaseTestPyPyC):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py b/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
--- a/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import re
 
 from rpython.tool.logparser import extract_category
diff --git a/pypy/module/pypyjit/test_pypy_c/test_math.py b/pypy/module/pypyjit/test_pypy_c/test_math.py
--- a/pypy/module/pypyjit/test_pypy_c/test_math.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_math.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 
diff --git a/pypy/module/pypyjit/test_pypy_c/test_misc.py b/pypy/module/pypyjit/test_pypy_c/test_misc.py
--- a/pypy/module/pypyjit/test_pypy_c/test_misc.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_misc.py
@@ -1,4 +1,4 @@
-import py, sys
+import pypy._py as py, sys
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 
diff --git a/pypy/module/pypyjit/test_pypy_c/test_shift.py b/pypy/module/pypyjit/test_pypy_c/test_shift.py
--- a/pypy/module/pypyjit/test_pypy_c/test_shift.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_shift.py
@@ -1,4 +1,4 @@
-import py, sys
+import pypy._py as py, sys
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
 class TestShift(BaseTestPyPyC):
diff --git a/pypy/module/select/conftest.py b/pypy/module/select/conftest.py
--- a/pypy/module/select/conftest.py
+++ b/pypy/module/select/conftest.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 
 def pytest_collect_directory():
     py.test.importorskip("ctypes")
diff --git a/pypy/module/select/test/test_epoll.py b/pypy/module/select/test/test_epoll.py
--- a/pypy/module/select/test/test_epoll.py
+++ b/pypy/module/select/test/test_epoll.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import sys
 
 # add a larger timeout for slow ARM machines
diff --git a/pypy/module/select/test/test_kqueue.py b/pypy/module/select/test/test_kqueue.py
--- a/pypy/module/select/test/test_kqueue.py
+++ b/pypy/module/select/test/test_kqueue.py
@@ -1,6 +1,6 @@
 # adapted from CPython: Lib/test/test_kqueue.py
 
-import py
+import pypy._py as py
 import sys
 
 class AppTestKqueue(object):
diff --git a/pypy/module/select/test/test_select.py b/pypy/module/select/test/test_select.py
--- a/pypy/module/select/test/test_select.py
+++ b/pypy/module/select/test/test_select.py
@@ -1,6 +1,6 @@
 import sys
 
-import py
+import pypy._py as py
 
 from pypy.interpreter.error import OperationError
 
diff --git a/pypy/module/signal/test/test_signal.py b/pypy/module/signal/test/test_signal.py
--- a/pypy/module/signal/test/test_signal.py
+++ b/pypy/module/signal/test/test_signal.py
@@ -1,4 +1,4 @@
-import os, py, sys
+import os, pypy._py as py, sys
 import signal as cpy_signal
 
 
diff --git a/pypy/module/struct/test/test_struct.py b/pypy/module/struct/test/test_struct.py
--- a/pypy/module/struct/test/test_struct.py
+++ b/pypy/module/struct/test/test_struct.py
@@ -2,7 +2,7 @@
 Tests for the struct module implemented at interp-level in pypy/module/struct.
 """
 
-import py
+import pypy._py as py
 from rpython.rlib.rstruct.nativefmttable import native_is_bigendian
 
 
diff --git a/pypy/module/sys/test/test_encoding.py b/pypy/module/sys/test/test_encoding.py
--- a/pypy/module/sys/test/test_encoding.py
+++ b/pypy/module/sys/test/test_encoding.py
@@ -1,4 +1,4 @@
-import os, py
+import os, pypy._py as py
 from rpython.rlib import rlocale
 from pypy.module.sys.interp_encoding import _getfilesystemencoding
 from pypy.module.sys.interp_encoding import base_encoding
diff --git a/pypy/module/sys/test/test_initpath.py b/pypy/module/sys/test/test_initpath.py
--- a/pypy/module/sys/test/test_initpath.py
+++ b/pypy/module/sys/test/test_initpath.py
@@ -1,4 +1,4 @@
-import py
+import pypy._py as py
 import os.path
 from pypy.module.sys.initpath import (compute_stdlib_path, find_executable, find_stdlib,
                                       resolvedirof)
diff --git a/pypy/module/termios/test/test_termios.py b/pypy/module/termios/test/test_termios.py
--- a/pypy/module/termios/test/test_termios.py
+++ b/pypy/module/termios/test/test_termios.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import py
+import pypy._py as py
 from pypy.conftest import pypydir
 from rpython.tool.udir import udir
 
diff --git a/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py b/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py
--- a/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/backend_tests.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py
+import pypy._py as py
 import sys, ctypes
 from cffi import FFI, CDefError
 from pypy.module.test_lib_pypy.cffi_tests.support import *
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_cdata.py b/pypy/module/test_lib_pypy/cffi_tests/test_cdata.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_cdata.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_cdata.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py
+import pypy._py as py
 from cffi import FFI
 
 class FakeBackend(object):
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_ctypes.py b/pypy/module/test_lib_pypy/cffi_tests/test_ctypes.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_ctypes.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_ctypes.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py, sys
+import pypy._py as py, sys
 from pypy.module.test_lib_pypy.cffi_tests import backend_tests
 from cffi.backend_ctypes import CTypesBackend
 
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_ffi_backend.py b/pypy/module/test_lib_pypy/cffi_tests/test_ffi_backend.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_ffi_backend.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_ffi_backend.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py, sys, platform
+import pypy._py as py, sys, platform
 import pytest
 from pypy.module.test_lib_pypy.cffi_tests import backend_tests, test_function, test_ownlib
 from cffi import FFI
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_function.py b/pypy/module/test_lib_pypy/cffi_tests/test_function.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_function.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_function.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py
+import pypy._py as py
 from cffi import FFI
 import math, os, sys
 import ctypes.util
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_ownlib.py b/pypy/module/test_lib_pypy/cffi_tests/test_ownlib.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_ownlib.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_ownlib.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py, sys
+import pypy._py as py, sys
 import subprocess, weakref
 from cffi import FFI
 from cffi.backend_ctypes import CTypesBackend
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py b/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_parsing.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py, sys, re
+import pypy._py as py, sys, re
 from cffi import FFI, FFIError, CDefError, VerificationError
 
 class FakeBackend(object):
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_verify.py b/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py
+import pypy._py as py
 import sys, os, math, weakref
 from cffi import FFI, VerificationError, VerificationMissing, model
 from pypy.module.test_lib_pypy.cffi_tests.support import *
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_version.py b/pypy/module/test_lib_pypy/cffi_tests/test_version.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_version.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_version.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py, os, sys
+import pypy._py as py, os, sys
 import cffi, _cffi_backend
 
 def setup_module(mod):
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py b/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_zdistutils.py
@@ -1,6 +1,6 @@
 # Generated by pypy/tool/import_cffi.py
 import sys, os, imp, math, shutil
-import py
+import pypy._py as py
 from cffi import FFI, FFIError
 from cffi.verifier import Verifier, _locate_engine_class, _get_so_suffixes
 from cffi.ffiplatform import maybe_relative_path
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py b/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
@@ -1,5 +1,5 @@
 # Generated by pypy/tool/import_cffi.py
-import py, os, sys, shutil
+import pypy._py as py, os, sys, shutil
 import imp
 import subprocess
 from pypy.module.test_lib_pypy.cffi_tests.udir import udir
diff --git a/pypy/module/test_lib_pypy/cffi_tests/udir.py b/pypy/module/test_lib_pypy/cffi_tests/udir.py
--- a/pypy/module/test_lib_pypy/cffi_tests/udir.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/udir.py
@@ -1,4 +1,4 @@
 # Generated by pypy/tool/import_cffi.py
-import py
+import pypy._py as py
 
 udir = py.path.local.make_numbered_dir(prefix = 'ffi-')
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py b/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
@@ -1,4 +1,4 @@
-import py, pytest
+import pypy._py as py, pytest
 import sys
 
 def pytest_ignore_collect(path):