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

sort out import misstake

This commit is contained in:
Ronny Pfannschmidt 2018-02-22 15:13:01 +01:00
parent 935dd3aaa5
commit 2cd69cf632
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/mark/__init__.py
View File

@ -3,11 +3,15 @@ from __future__ import absolute_import, division, print_function
from _pytest.config import UsageError from _pytest.config import UsageError
from .structures import ( from .structures import (
ParameterSet, EMPTY_PARAMETERSET_OPTION, MARK_GEN, ParameterSet, EMPTY_PARAMETERSET_OPTION, MARK_GEN,
Mark, MarkInfo, MarkDecorator, Mark, MarkInfo, MarkDecorator, MarkGenerator,
transfer_markers, get_empty_parameterset_mark
) )
from .legacy import matchkeyword, matchmark from .legacy import matchkeyword, matchmark
__all__ = ['Mark', 'MarkInfo', 'MarkDecorator'] __all__ = [
'Mark', 'MarkInfo', 'MarkDecorator', 'MarkGenerator',
'transfer_markers', 'get_empty_parameterset_mark'
]
class MarkerError(Exception): class MarkerError(Exception):

2
_pytest/python.py
View File

@ -28,7 +28,7 @@ from _pytest.compat import (
safe_str, getlocation, enum, safe_str, getlocation, enum,
) )
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.mark.legacy import transfer_markers from _pytest.mark.structures import transfer_markers
# relative paths that we use to filter traceback entries from appearing to the user; # relative paths that we use to filter traceback entries from appearing to the user;