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

Merge pull request #7274 from bluetech/rm-py-error 

code: remove last usage of py.error
This commit is contained in:
Ran Benita 2020-05-28 13:10:46 +03:00 committed by GitHub
parent b3db440d4c 2ee90887b7
commit e3190604ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/_code/code.py
View File

@ -268,10 +268,6 @@ class TracebackEntry:
return tbh return tbh
def __str__(self) -> str: def __str__(self) -> str:
try:
fn = str(self.path)
except py.error.Error:
fn = "???"
name = self.frame.code.name name = self.frame.code.name
try: try:
line = str(self.statement).lstrip() line = str(self.statement).lstrip()
@ -279,7 +275,7 @@ class TracebackEntry:
raise raise
except BaseException: except BaseException:
line = "???" line = "???"
return " File %r:%d in %s\n %s\n" % (fn, self.lineno + 1, name, line) return " File %r:%d in %s\n %s\n" % (self.path, self.lineno + 1, name, line)
@property @property
def name(self) -> str: def name(self) -> str: