floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue #2920

This commit is contained in:
Roland Puntaier 2017-11-28 16:47:12 +01:00
parent 4d2f05e4b9
commit 4ea7bbc197
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/config.py
View File

@ -417,7 +417,7 @@ class PytestPluginManager(PluginManager):
# _pytest prefix. # _pytest prefix.
assert isinstance(modname, (six.text_type, str)), "module name as text required, got %r" % modname assert isinstance(modname, (six.text_type, str)), "module name as text required, got %r" % modname
modname = str(modname) modname = str(modname)
if self.get_plugin(modname) is not None: if self.is_blocked(modname) or self.get_plugin(modname) is not None:
return return
if modname in builtin_plugins: if modname in builtin_plugins:
importspec = "_pytest." + modname importspec = "_pytest." + modname