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

Merge pull request #6510 from blueyed/typing-fixes 

typing: fix some "incompatible types in assignment" with py
This commit is contained in:
Daniel Hahler 2020-01-19 13:01:35 +01:00 committed by GitHub
parent 32b62f770f aaae43e0ba
commit d347a30656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/compat.py
View File

@ -97,8 +97,10 @@ def getlocation(function, curdir=None) -> str:
function = get_real_func(function) function = get_real_func(function)
fn = py.path.local(inspect.getfile(function)) fn = py.path.local(inspect.getfile(function))
lineno = function.__code__.co_firstlineno lineno = function.__code__.co_firstlineno
if curdir is not None and fn.relto(curdir): if curdir is not None:
fn = fn.relto(curdir) relfn = fn.relto(curdir)
if relfn:
return "%s:%d" % (relfn, lineno + 1)
return "%s:%d" % (fn, lineno + 1) return "%s:%d" % (fn, lineno + 1)

4
src/_pytest/config/findpaths.py
View File

@ -121,7 +121,9 @@ def determine_setup(
sections = ["tool:pytest", "pytest"] if is_cfg_file else ["pytest"] sections = ["tool:pytest", "pytest"] if is_cfg_file else ["pytest"]
for section in sections: for section in sections:
try: try:
inicfg = iniconfig[section] inicfg = iniconfig[
section
] # type: Optional[py.iniconfig._SectionWrapper]
if is_cfg_file and section == "pytest" and config is not None: if is_cfg_file and section == "pytest" and config is not None:
fail( fail(
CFG_PYTEST_SECTION.format(filename=str(inifile)), pytrace=False CFG_PYTEST_SECTION.format(filename=str(inifile)), pytrace=False