[py-svn] r7936 - py/dist/py/magic

[hpk at codespeak.net]

Author: hpk
Date: Sun Dec 19 18:33:13 2004
New Revision: 7936

Modified:
   py/dist/py/magic/assertion.py
   py/dist/py/magic/test_dyncode.py
Log:
use dyncode less part 2 



Modified: py/dist/py/magic/assertion.py
==============================================================================
--- py/dist/py/magic/assertion.py	(original)
+++ py/dist/py/magic/assertion.py	Sun Dec 19 18:33:13 2004
@@ -1,6 +1,6 @@
 import __builtin__, sys
-from py import magic
-from py.__impl__.magic import exprinfo, dyncode
+import py 
+from py.__impl__.magic import exprinfo
 
 BuiltinAssertionError = __builtin__.AssertionError
 
@@ -8,7 +8,8 @@
     def __init__(self, *args):
         BuiltinAssertionError.__init__(self, *args)
         f = sys._getframe(1)
-        source = dyncode.getparseablestartingblock(f)
+        source = py.code.RunnerFrame(f).statement 
+        source = str(source).strip()
         #print "f.f_lineno", f.f_lineno 
         if source:
             self.msg = exprinfo.interpret(source, f)
@@ -21,8 +22,7 @@
         else:
             self.msg = None
 
-
 def invoke():
-    magic.patch(__builtin__, 'AssertionError', AssertionError)
+    py.magic.patch(__builtin__, 'AssertionError', AssertionError)
 def revoke():
-    magic.revert(__builtin__, 'AssertionError') 
+    py.magic.revert(__builtin__, 'AssertionError') 

Modified: py/dist/py/magic/test_dyncode.py
==============================================================================
--- py/dist/py/magic/test_dyncode.py	(original)
+++ py/dist/py/magic/test_dyncode.py	Sun Dec 19 18:33:13 2004
@@ -56,7 +56,7 @@
     fn = dyncode.getpyfile(dyncode)
     assert os.path.exists(fn)
 
-def test_getstartingblock_singleline():
+def DEPRECATED_test_getstartingblock_singleline():
     class A:
         def __init__(self, *args):
             frame = sys._getframe(1)
@@ -67,7 +67,7 @@
     l = [i for i in x.source.split('\n') if i.strip()]
     assert len(l) == 1
 
-def test_getstartingblock_multiline():
+def DEPRECATED_test_getstartingblock_multiline():
     class A:
         def __init__(self, *args):
             frame = sys._getframe(1)
@@ -81,7 +81,7 @@
     l = [i for i in x.source.split('\n') if i.strip()]
     assert len(l) == 4
 
-def test_getline_finally():
+def DEPRECATED_test_getline_finally():
     def c(): pass
     excinfo = py.test.raises(TypeError, """
            teardown = None