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

expand try/except/finally which py2.4 does't like

This commit is contained in:
Benjamin Peterson 2011-05-25 15:55:57 -05:00
parent c0910abf2f
commit e02d22aa4f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_pytest/python.py
View File

@ -227,8 +227,11 @@ class Module(pytest.File, PyCollectorMixin):
def _importtestmodule(self): def _importtestmodule(self):
self.ihook.pytest_pycollect_before_module_import(mod=self) self.ihook.pytest_pycollect_before_module_import(mod=self)
# we assume we are only called once per module # we assume we are only called once per module
try:
try: try:
mod = self.fspath.pyimport(ensuresyspath=True) mod = self.fspath.pyimport(ensuresyspath=True)
finally:
self.ihook.pytest_pycollect_after_module_import(mod=self)
except SyntaxError: except SyntaxError:
excinfo = py.code.ExceptionInfo() excinfo = py.code.ExceptionInfo()
raise self.CollectError(excinfo.getrepr(style="short")) raise self.CollectError(excinfo.getrepr(style="short"))
@ -243,8 +246,6 @@ class Module(pytest.File, PyCollectorMixin):
"HINT: use a unique basename for your test file modules" "HINT: use a unique basename for your test file modules"
% e.args % e.args
) )
finally:
self.ihook.pytest_pycollect_after_module_import(mod=self)
#print "imported test module", mod #print "imported test module", mod
self.config.pluginmanager.consider_module(mod) self.config.pluginmanager.consider_module(mod)
return mod return mod