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

Merge pull request #4863 from blueyed/remove-import 

Move import of  _format_explanation in _pytest.assertion.rewrite
This commit is contained in:
Daniel Hahler 2019-03-01 15:13:26 +01:00 committed by GitHub
parent c7bbb2a788 9cb71af9e5
commit 42561db1ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/assertion/rewrite.py
View File

@ -21,6 +21,9 @@ import six
from _pytest._io.saferepr import saferepr from _pytest._io.saferepr import saferepr
from _pytest.assertion import util from _pytest.assertion import util
from _pytest.assertion.util import ( # noqa: F401
format_explanation as _format_explanation,
)
from _pytest.compat import spec_from_file_location from _pytest.compat import spec_from_file_location
from _pytest.pathlib import fnmatch_ex from _pytest.pathlib import fnmatch_ex
from _pytest.pathlib import PurePath from _pytest.pathlib import PurePath
@ -483,9 +486,6 @@ def _saferepr(obj):
return r.replace(u"\n", u"\\n") return r.replace(u"\n", u"\\n")
from _pytest.assertion.util import format_explanation as _format_explanation # noqa
def _format_assertmsg(obj): def _format_assertmsg(obj):
"""Format the custom assertion message given. """Format the custom assertion message given.