[pypy-svn] r71608 - in pypy/branch/jit-sandbox/pypy: . tool tool/pytest translator/platform

[fijal at codespeak.net]

Author: fijal
Date: Tue Mar  2 05:47:52 2010
New Revision: 71608

Modified:
   pypy/branch/jit-sandbox/pypy/conftest.py
   pypy/branch/jit-sandbox/pypy/tool/ansi_mandelbrot.py
   pypy/branch/jit-sandbox/pypy/tool/ansi_print.py
   pypy/branch/jit-sandbox/pypy/tool/pytest/appsupport.py
   pypy/branch/jit-sandbox/pypy/translator/platform/__init__.py
Log:
Merge 71607 from trunk


Modified: pypy/branch/jit-sandbox/pypy/conftest.py
==============================================================================
--- pypy/branch/jit-sandbox/pypy/conftest.py	(original)
+++ pypy/branch/jit-sandbox/pypy/conftest.py	Tue Mar  2 05:47:52 2010
@@ -1,5 +1,8 @@
 import py, sys, os
-from py.impl.test.outcome import Failed
+try:
+    from py.impl.test.outcome import Failed
+except:
+    from py._test.outcome import Failed
 from pypy.interpreter.gateway import app2interp_temp
 from pypy.interpreter.error import OperationError
 from pypy.tool.pytest import appsupport

Modified: pypy/branch/jit-sandbox/pypy/tool/ansi_mandelbrot.py
==============================================================================
--- pypy/branch/jit-sandbox/pypy/tool/ansi_mandelbrot.py	(original)
+++ pypy/branch/jit-sandbox/pypy/tool/ansi_mandelbrot.py	Tue Mar  2 05:47:52 2010
@@ -1,6 +1,9 @@
 import sys
 
-from py.impl.io.terminalwriter import ansi_print, get_terminal_width
+try:
+    from py.impl.io.terminalwriter import ansi_print, get_terminal_width
+except:
+    from py._io.terminalwriter import ansi_print, get_terminal_width
 
 """
 Black       0;30     Dark Gray     1;30

Modified: pypy/branch/jit-sandbox/pypy/tool/ansi_print.py
==============================================================================
--- pypy/branch/jit-sandbox/pypy/tool/ansi_print.py	(original)
+++ pypy/branch/jit-sandbox/pypy/tool/ansi_print.py	Tue Mar  2 05:47:52 2010
@@ -4,7 +4,10 @@
 
 import sys
 
-from py.impl.io.terminalwriter import ansi_print
+try:
+    from py.impl.io.terminalwriter import ansi_print
+except:
+    from py._io.terminalwriter import ansi_print
 from pypy.tool.ansi_mandelbrot import Driver
 
 class AnsiLog:

Modified: pypy/branch/jit-sandbox/pypy/tool/pytest/appsupport.py
==============================================================================
--- pypy/branch/jit-sandbox/pypy/tool/pytest/appsupport.py	(original)
+++ pypy/branch/jit-sandbox/pypy/tool/pytest/appsupport.py	Tue Mar  2 05:47:52 2010
@@ -1,10 +1,15 @@
 import autopath
 import py
-import py.impl.code.assertion
-from py.impl.code import _assertionold as exprinfo
+try:
+    import py.impl.code.assertion
+    from py.impl.code import _assertionold as exprinfo
+    from py.impl.test.outcome import ExceptionFailure
+except:
+    import py._code.assertion
+    from py._code import _assertionold as exprinfo
+    from py._test.outcome import ExceptionFailure
 from pypy.interpreter import gateway
 from pypy.interpreter.error import OperationError
-from py.impl.test.outcome import ExceptionFailure
 
 # ____________________________________________________________
 

Modified: pypy/branch/jit-sandbox/pypy/translator/platform/__init__.py
==============================================================================
--- pypy/branch/jit-sandbox/pypy/translator/platform/__init__.py	(original)
+++ pypy/branch/jit-sandbox/pypy/translator/platform/__init__.py	Tue Mar  2 05:47:52 2010
@@ -6,7 +6,10 @@
 import sys, py, os
 
 from pypy.tool.ansi_print import ansi_log
-from py.impl.code.code import safe_repr
+try:
+    from py.impl.code.code import safe_repr
+except:
+    from py._code.code import safe_repr
 log = py.log.Producer("platform")
 py.log.setconsumer("platform", ansi_log)