[pypy-svn] r71610 - in pypy/branch/jit-sandbox/pypy: . tool tool/pytest translator/platform
fijal at codespeak.net
fijal at codespeak.net
Tue Mar 2 05:53:28 CET 2010
Author: fijal
Date: Tue Mar 2 05:53:26 2010
New Revision: 71610
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:
Revert 71608
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:53:26 2010
@@ -1,8 +1,5 @@
import py, sys, os
-try:
- from py.impl.test.outcome import Failed
-except:
- from py._test.outcome import Failed
+from py.impl.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:53:26 2010
@@ -1,9 +1,6 @@
import sys
-try:
- from py.impl.io.terminalwriter import ansi_print, get_terminal_width
-except:
- from py._io.terminalwriter import ansi_print, get_terminal_width
+from py.impl.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:53:26 2010
@@ -4,10 +4,7 @@
import sys
-try:
- from py.impl.io.terminalwriter import ansi_print
-except:
- from py._io.terminalwriter import ansi_print
+from py.impl.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:53:26 2010
@@ -1,15 +1,10 @@
import autopath
import py
-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
+import py.impl.code.assertion
+from py.impl.code import _assertionold as exprinfo
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:53:26 2010
@@ -6,10 +6,7 @@
import sys, py, os
from pypy.tool.ansi_print import ansi_log
-try:
- from py.impl.code.code import safe_repr
-except:
- from py._code.code import safe_repr
+from py.impl.code.code import safe_repr
log = py.log.Producer("platform")
py.log.setconsumer("platform", ansi_log)
More information about the Pypy-commit
mailing list