[pypy-svn] r35626 - in pypy/dist/pypy/tool: pytest test
fijal at codespeak.net
fijal at codespeak.net
Tue Dec 12 13:05:22 CET 2006
Author: fijal
Date: Tue Dec 12 13:05:17 2006
New Revision: 35626
Modified:
pypy/dist/pypy/tool/pytest/appsupport.py
pypy/dist/pypy/tool/test/test_pytestsupport.py
Log:
Fixed tests.
Modified: pypy/dist/pypy/tool/pytest/appsupport.py
==============================================================================
--- pypy/dist/pypy/tool/pytest/appsupport.py (original)
+++ pypy/dist/pypy/tool/pytest/appsupport.py Tue Dec 12 13:05:17 2006
@@ -17,9 +17,13 @@
#except OperationError:
# self.path = space.unwrap(space.getattr(
self.path = py.path.local(space.str_w(self.w_file))
+ self.space = space
def fullsource(self):
- return py.code.Source(self.path.read(mode="rU"))
+ try:
+ return self.space.str_w(self.w_file).__source__
+ except AttributeError:
+ return py.code.Source(self.path.read(mode="rU"))
fullsource = property(fullsource, None, None, "Full source of AppCode")
class AppFrame(py.code.Frame):
Modified: pypy/dist/pypy/tool/test/test_pytestsupport.py
==============================================================================
--- pypy/dist/pypy/tool/test/test_pytestsupport.py (original)
+++ pypy/dist/pypy/tool/test/test_pytestsupport.py Tue Dec 12 13:05:17 2006
@@ -15,7 +15,7 @@
import sys
co = PyCode._from_code(space, somefunc.func_code)
pyframe = PyFrame(space, co, space.newdict(), None)
- runner = AppFrame(pyframe)
+ runner = AppFrame(space, pyframe)
exprinfo.run("f = lambda x: x+1", runner)
msg = exprinfo.interpret("assert isinstance(f(2), float)", runner)
assert msg.startswith("assert isinstance(3, float)\n"
More information about the Pypy-commit
mailing list