p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

two fixes for Jython 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-10-07 08:55:44 +02:00
parent 253c173a88
commit 6b0db18eca
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/_code/code.py
View File

@ -157,7 +157,8 @@ class TracebackEntry(object):
return self.exprinfo return self.exprinfo
def getfirstlinesource(self): def getfirstlinesource(self):
return self.frame.code.firstlineno # on Jython this firstlineno can be -1 apparently
return max(self.frame.code.firstlineno, 0)
def getsource(self): def getsource(self):
""" return failing source code. """ """ return failing source code. """

2
testing/plugin/test_pytest_terminal.py
View File

@ -610,7 +610,7 @@ def pytest_report_header(config):
"*hello: info*", "*hello: info*",
]) ])
needsosdup = py.test.mark.xfail("not hasattr(os, 'dup')") @py.test.mark.xfail("not hasattr(os, 'dup')")
def test_fdopen_kept_alive_issue124(testdir): def test_fdopen_kept_alive_issue124(testdir):
testdir.makepyfile(""" testdir.makepyfile("""
import os, sys import os, sys