Moved py.code code over to py.test

This is dependent on a feature branch of the py repository

Fix #103

Author: nicoddemus

_pytest/assertion/newinterpret.py

@@ -6,7 +6,7 @@
 import sys
 import ast
 
-import py
+import _pytest.code
 from _pytest.assertion import util
 from _pytest.assertion.reinterpret import BuiltinAssertionError
 
@@ -63,7 +63,7 @@ def interpret(source, frame, should_fail=False):
 
 def run(offending_line, frame=None):
     if frame is None:
-        frame = py.code.Frame(sys._getframe(1))
+        frame = _pytest.code.Frame(sys._getframe(1))
     return interpret(offending_line, frame)
 
 def getfailure(e):

_pytest/assertion/oldinterpret.py

@@ -1,8 +1,12 @@
+import inspect
+import sys
 import traceback
 import types
-import py
-import sys, inspect
+
 from compiler import parse, ast, pycodegen
+
+import _pytest.code
+import py
 from _pytest.assertion.util import format_explanation, BuiltinAssertionError
 
 passthroughex = py.builtin._sysex
@@ -456,7 +460,7 @@ def report_failure(e):
 def check(s, frame=None):
     if frame is None:
         frame = sys._getframe(1)
-        frame = py.code.Frame(frame)
+        frame = _pytest.code.Frame(frame)
     expr = parse(s, 'eval')
     assert isinstance(expr, ast.Expression)
     node = Interpretable(expr.node)
@@ -480,7 +484,7 @@ def interpret(source, frame, should_fail=False):
     module = Interpretable(parse(source, 'exec').node)
     #print "got module", module
     if isinstance(frame, types.FrameType):
-        frame = py.code.Frame(frame)
+        frame = _pytest.code.Frame(frame)
     try:
         module.run(frame)
     except Failure:
@@ -499,9 +503,9 @@ def interpret(source, frame, should_fail=False):
 
 def getmsg(excinfo):
     if isinstance(excinfo, tuple):
-        excinfo = py.code.ExceptionInfo(excinfo)
+        excinfo = _pytest.code.ExceptionInfo(excinfo)
     #frame, line = gettbline(tb)
-    #frame = py.code.Frame(frame)
+    #frame = _pytest.code.Frame(frame)
     #return interpret(line, frame)
 
     tb = excinfo.traceback[-1]
@@ -525,7 +529,7 @@ def getfailure(e):
 def run(s, frame=None):
     if frame is None:
         frame = sys._getframe(1)
-        frame = py.code.Frame(frame)
+        frame = _pytest.code.Frame(frame)
     module = Interpretable(parse(s, 'exec').node)
     try:
         module.run(frame)

_pytest/assertion/reinterpret.py

@@ -1,6 +1,9 @@
 import sys
+
+import _pytest.code
 import py
 from _pytest.assertion.util import BuiltinAssertionError
+
 u = py.builtin._totext
 
 
@@ -22,7 +25,7 @@ def __init__(self, *args):
                     "<[broken __repr__] %s at %0xd>"
                     % (toprint.__class__, id(toprint)))
         else:
-            f = py.code.Frame(sys._getframe(1))
+            f = _pytest.code.Frame(sys._getframe(1))
             try:
                 source = f.code.fullsource
                 if source is not None:

_pytest/assertion/util.py

@@ -1,6 +1,7 @@
 """Utilities for assertion debugging"""
 import pprint
 
+import _pytest.code
 import py
 try:
     from collections import Sequence
@@ -179,7 +180,7 @@ def isiterable(obj):
         explanation = [
             u('(pytest_assertion plugin: representation of details failed.  '
               'Probably an object has a faulty __repr__.)'),
-            u(py.code.ExceptionInfo())]
+            u(_pytest.code.ExceptionInfo())]
 
     if not explanation:
         return None

_pytest/code/__init__.py

@@ -0,0 +1,17 @@
+""" python inspection/code generation API """
+from .assertion import AssertionError as _AssertionError  # noqa
+from .assertion import _format_explanation  # noqa
+from .assertion import _reprcompare  # noqa
+from .assertion import reinterpret as _reinterpret  # noqa
+from .assertion import reinterpret_old as _reinterpret_old  # noqa
+from .code import Code  # noqa
+from .code import ExceptionInfo  # noqa
+from .code import Frame  # noqa
+from .code import Traceback  # noqa
+from .code import getrawcode  # noqa
+from .code import patch_builtins  # noqa
+from .code import unpatch_builtins  # noqa
+from .source import Source  # noqa
+from .source import compile_ as compile  # noqa
+from .source import getfslineno  # noqa
+