jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor: typo and code style

This commit is contained in:
Daniel Hahler 2018-10-12 16:52:13 +02:00
parent eabf15b626
commit 10ddc466bf
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_pytest/fixtures.py
View File

@ -1013,7 +1013,7 @@ class FixtureFunctionMarker(object):
def __call__(self, function): def __call__(self, function):
if isclass(function): if isclass(function):
raise ValueError("class fixtures not supported (may be in the future)") raise ValueError("class fixtures not supported (maybe in the future)")
if getattr(function, "_pytestfixturefunction", False): if getattr(function, "_pytestfixturefunction", False):
raise ValueError( raise ValueError(
@ -1366,8 +1366,7 @@ class FixtureManager(object):
fixturedefs = self._arg2fixturedefs[argname] fixturedefs = self._arg2fixturedefs[argname]
except KeyError: except KeyError:
return None return None
else: return tuple(self._matchfactories(fixturedefs, nodeid))
return tuple(self._matchfactories(fixturedefs, nodeid))
def _matchfactories(self, fixturedefs, nodeid): def _matchfactories(self, fixturedefs, nodeid):
for fixturedef in fixturedefs: for fixturedef in fixturedefs:

7
src/_pytest/main.py
View File

@ -564,9 +564,7 @@ class Session(nodes.FSCollector):
return True return True
def _tryconvertpyarg(self, x): def _tryconvertpyarg(self, x):
"""Convert a dotted module name to path. """Convert a dotted module name to path."""
"""
try: try:
with _patched_find_module(): with _patched_find_module():
loader = pkgutil.find_loader(x) loader = pkgutil.find_loader(x)
@ -598,8 +596,7 @@ class Session(nodes.FSCollector):
raise UsageError( raise UsageError(
"file or package not found: " + arg + " (missing __init__.py?)" "file or package not found: " + arg + " (missing __init__.py?)"
) )
else: raise UsageError("file not found: " + arg)
raise UsageError("file not found: " + arg)
parts[0] = path parts[0] = path
return parts return parts