diff options
author | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
---|---|---|
committer | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
commit | a4795e7a6f50b2aaab3a761fc2b7614961103824 (patch) | |
tree | b9d813221c35025ebc9bec036875b73d0597a700 /Lib/logging | |
parent | 5b0edfb83b728ff24e4fa0721ed45355cf9c2166 (diff) | |
download | cpython-a4795e7a6f50b2aaab3a761fc2b7614961103824.tar.gz |
Merge part of the trunk changes into the p3yk branch. This merges from 43030
(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.
This merge should break no additional tests.
The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;)
Diffstat (limited to 'Lib/logging')
-rw-r--r-- | Lib/logging/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 4b2f8a668a..7db0dabc9e 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1058,13 +1058,16 @@ class Logger(Filterer): file name, line number and function name. """ f = currentframe().f_back - while 1: + rv = "(unknown file)", 0, "(unknown function)" + while hasattr(f, "f_code"): co = f.f_code filename = os.path.normcase(co.co_filename) if filename == _srcfile: f = f.f_back continue - return filename, f.f_lineno, co.co_name + rv = (filename, f.f_lineno, co.co_name) + break + return rv def makeRecord(self, name, level, fn, lno, msg, args, exc_info, func=None, extra=None): """ |