codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Logging] Fix findCaller with unknown source 

In case no source was found, a 3-tuple was returned instead of a 4-tuple
in Python 3
This commit is contained in:
minus 2019-11-19 17:14:01 +01:00
parent 351664ec07
commit 5e06aee5c8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deluge/log.py
View File

@ -88,7 +88,7 @@ class Logging(LoggingLoggerClass):
def findCaller(self, *args, **kwargs): # NOQA: N802 def findCaller(self, *args, **kwargs): # NOQA: N802
f = logging.currentframe().f_back f = logging.currentframe().f_back
rv = '(unknown file)', 0, '(unknown function)' rv = ('(unknown file)', 0, '(unknown function)', None)
while hasattr(f, 'f_code'): while hasattr(f, 'f_code'):
co = f.f_code co = f.f_code
filename = os.path.normcase(co.co_filename) filename = os.path.normcase(co.co_filename)
@ -98,12 +98,12 @@ class Logging(LoggingLoggerClass):
): ):
f = f.f_back f = f.f_back
continue continue
if common.PY2: rv = (co.co_filename, f.f_lineno, co.co_name, None)
rv = (filename, f.f_lineno, co.co_name)
else:
rv = (filename, f.f_lineno, co.co_name, None)
break break
return rv if common.PY2:
return rv[:-1]
else:
return rv
levels = { levels = {