Author: Alexander Hesse <webmas...@aquanasoft.de>
Branch: prepare-split
Changeset: r69026:16b33a5a5911
Date: 2014-01-31 00:23 +0100
http://bitbucket.org/pypy/pypy/changeset/16b33a5a5911/
Log: missed a few
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
@@ -7,7 +7,7 @@
import ast
import pypy._py as py
-from py._code.assertion import _format_explanation, BuiltinAssertionError
+from pypy._py._code.assertion import _format_explanation, BuiltinAssertionError
if sys.platform.startswith("java") and sys.version_info < (2, 5, 2):
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,7 +1,7 @@
import pypy._py as py
import sys, inspect
from compiler import parse, ast, pycodegen
-from py._code.assertion import BuiltinAssertionError, _format_explanation
+from pypy._py._code.assertion import BuiltinAssertionError, _format_explanation
passthroughex = py.builtin._sysex
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
@@ -86,9 +86,9 @@
AssertionError.__module__ = "builtins"
reinterpret_old = "old reinterpretation not available for py3"
else:
- from py._code._assertionold import interpret as reinterpret_old
+ from pypy._py._code._assertionold import interpret as reinterpret_old
if sys.version_info >= (2, 6) or (sys.platform.startswith("java")):
- from py._code._assertionnew import interpret as reinterpret
+ from pypy._py._code._assertionnew import interpret as reinterpret
else:
reinterpret = reinterpret_old
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
@@ -37,7 +37,7 @@
def fullsource(self):
""" return a py.code.Source object for the full source file of the code
"""
- from py._code import source
+ from pypy._py._code import source
full, _ = source.findsource(self.raw)
return full
fullsource = property(fullsource, None, None,
@@ -715,7 +715,7 @@
def patch_builtins(assertion=True, compile=True):
""" put compile and AssertionError builtins to Python's builtins. """
if assertion:
- from py._code import assertion
+ from pypy._py._code import assertion
l = oldbuiltins.setdefault('AssertionError', [])
l.append(py.builtin.builtins.AssertionError)
py.builtin.builtins.AssertionError = assertion.AssertionError
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
@@ -3,7 +3,7 @@
"""
import sys, os, stat, re, atexit
import pypy._py as py
-from py._path import common
+from pypy._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
@@ -7,9 +7,9 @@
import os, sys, time, re
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
+from pypy._py._path import common
+from pypy._py._path import svnwc as svncommon
+from pypy._py._path.cacheutil import BuildcostAccessCache, AgingCache
DEBUG=False
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
@@ -8,7 +8,7 @@
import os, sys, time, re, calendar
import pypy._py as py
import subprocess
-from py._path import common
+from pypy._py._path import common
#-----------------------------------------------------------
# Caching latest repository revision and repo-paths
diff --git a/pypy/interpreter/test/test_objspace.py
b/pypy/interpreter/test/test_objspace.py
--- a/pypy/interpreter/test/test_objspace.py
+++ b/pypy/interpreter/test/test_objspace.py
@@ -1,4 +1,4 @@
-from py.test import raises
+from pypy._py.test import raises
from pypy.interpreter.error import OperationError
from pypy.interpreter.function import Function
from pypy.interpreter.pycode import PyCode
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
@@ -765,7 +765,7 @@
if __name__ == '__main__':
# only to check on top of CPython (you need 2.4)
- from py.test import raises
+ from pypy._py.test import raises
for s in VALID:
try:
compile(s, '?', 'exec')
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,7 +1,7 @@
"""Regular expression tests specific to _sre.py and accumulated during TDD."""
import os
import pypy._py as py
-from py.test import raises, skip
+from pypy._py.test import raises, skip
from pypy.interpreter.gateway import app2interp_temp
def init_app_test(cls, space):
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,7 +1,7 @@
# minimal tests. See also lib-python/modified-2.4.1/test/test_array.
import pypy._py as py
-from py.test import raises
+from pypy._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
@@ -10,7 +10,7 @@
HUGE_OK = False
if os.name == "nt":
- from py.test import skip
+ from pypy._py.test import skip
skip("bz2 module is not available on Windows")
def setup_module(mod):
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
@@ -10,7 +10,7 @@
if os.name == "nt":
- from py.test import skip
+ from pypy._py.test import skip
skip("bz2 module is not available on Windows")
def setup_module(mod):
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
@@ -35,7 +35,7 @@
from pypy.module import exceptions
from pypy.module.exceptions import interp_exceptions
# CPython 2.4 compatibility
-from py.builtin import BaseException
+from pypy._py.builtin import BaseException
from rpython.tool.sourcetools import func_with_new_name
from rpython.rtyper.lltypesystem.lloperation import llop
diff --git a/pypy/module/test_lib_pypy/test_coroutine.py
b/pypy/module/test_lib_pypy/test_coroutine.py
--- a/pypy/module/test_lib_pypy/test_coroutine.py
+++ b/pypy/module/test_lib_pypy/test_coroutine.py
@@ -1,5 +1,5 @@
from __future__ import absolute_import
-from py.test import skip, raises
+from pypy._py.test import skip, raises
skip('test needs to be updated')
diff --git a/pypy/module/test_lib_pypy/test_stackless.py
b/pypy/module/test_lib_pypy/test_stackless.py
--- a/pypy/module/test_lib_pypy/test_stackless.py
+++ b/pypy/module/test_lib_pypy/test_stackless.py
@@ -5,7 +5,7 @@
3. pypy-c
"""
from __future__ import absolute_import
-from py.test import skip
+from pypy._py.test import skip
try:
import stackless
except ImportError:
diff --git a/pypy/module/test_lib_pypy/test_stackless_pickling.py
b/pypy/module/test_lib_pypy/test_stackless_pickling.py
--- a/pypy/module/test_lib_pypy/test_stackless_pickling.py
+++ b/pypy/module/test_lib_pypy/test_stackless_pickling.py
@@ -1,5 +1,5 @@
from __future__ import absolute_import
-from py.test import skip
+from pypy._py.test import skip
try:
import stackless
except ImportError:
diff --git a/pypy/module/zlib/test/test_zlib.py
b/pypy/module/zlib/test/test_zlib.py
--- a/pypy/module/zlib/test/test_zlib.py
+++ b/pypy/module/zlib/test/test_zlib.py
@@ -6,12 +6,12 @@
try:
import zlib
except ImportError:
- import py; py.test.skip("no zlib module on this host Python")
+ import pypy._py as py; py.test.skip("no zlib module on this host Python")
try:
from pypy.module.zlib import interp_zlib
except ImportError:
- import py; py.test.skip("no zlib C library on this machine")
+ import pypy._py as py; py.test.skip("no zlib C library on this machine")
def test_unsigned_to_signed_32bit():
assert interp_zlib.unsigned_to_signed_32bit(123) == 123
diff --git a/pypy/objspace/std/test/test_index.py
b/pypy/objspace/std/test/test_index.py
--- a/pypy/objspace/std/test/test_index.py
+++ b/pypy/objspace/std/test/test_index.py
@@ -1,4 +1,4 @@
-from py.test import raises
+from pypy._py.test import raises
class AppTest_IndexProtocol:
def setup_class(self):
diff --git a/pypy/objspace/std/test/test_multimethod.py
b/pypy/objspace/std/test/test_multimethod.py
--- a/pypy/objspace/std/test/test_multimethod.py
+++ b/pypy/objspace/std/test/test_multimethod.py
@@ -1,4 +1,4 @@
-from py.test import raises
+from pypy._py.test import raises
from pypy.objspace.std import multimethod
from pypy.objspace.std.multimethod import FailedToImplement
diff --git a/pypy/objspace/std/test/test_stdobjspace.py
b/pypy/objspace/std/test/test_stdobjspace.py
--- a/pypy/objspace/std/test/test_stdobjspace.py
+++ b/pypy/objspace/std/test/test_stdobjspace.py
@@ -1,5 +1,5 @@
import pypy._py as py
-from py.test import raises
+from pypy._py.test import raises
from pypy.interpreter.error import OperationError
from pypy.tool.pytest.objspace import gettestobjspace
diff --git a/pypy/tool/genstatistic.py b/pypy/tool/genstatistic.py
--- a/pypy/tool/genstatistic.py
+++ b/pypy/tool/genstatistic.py
@@ -1,7 +1,7 @@
import pypy._py as py
-from py._cmdline import pycountloc as countloc
-from py.xml import raw
+from pypy._py._cmdline import pycountloc as countloc
+from pypy._py.xml import raw
from pypy import conftest
pypydir = py.path.local(conftest.pypydir)
diff --git a/pypy/tool/importfun.py b/pypy/tool/importfun.py
--- a/pypy/tool/importfun.py
+++ b/pypy/tool/importfun.py
@@ -495,7 +495,7 @@
return link
def html_for_module(module):
- from py.xml import html
+ from pypy._py.xml import html
out = file_for_module(module)
ourlink = link_for_module('', module)
head = [html.title(module.name)]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
