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

change try/except to sys.module.get and a conditional

This commit is contained in:
Chris Gilling 2014-03-26 09:27:33 -07:00
parent 3388d82c1c
commit c3f4eb6d57
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/python.py
View File

@ -1836,12 +1836,12 @@ def getfuncargnames(function, startindex=None):
if startindex is None: if startindex is None:
startindex = inspect.ismethod(function) and 1 or 0 startindex = inspect.ismethod(function) and 1 or 0
if realfunction != function: if realfunction != function:
try: mock_default = sys.modules.get('mock.DEFAULT')
from mock import DEFAULT if mock_default:
for patching in getattr(function, "patchings", []): for patching in getattr(function, "patchings", []):
if not patching.attribute_name and patching.new is DEFAULT: if not patching.attribute_name and patching.new is DEFAULT:
startindex += 1 startindex += 1
except ImportError: else:
startindex += len(getattr(function, "patchings", [])) startindex += len(getattr(function, "patchings", []))
function = realfunction function = realfunction
argnames = inspect.getargs(py.code.getrawcode(function))[0] argnames = inspect.getargs(py.code.getrawcode(function))[0]