changeset: 98832:da971f467f6e branch: 2.7 parent: 98826:a96e39e20490 user: Gregory P. Smith date: Thu Oct 22 13:09:50 2015 -0700 files: Lib/logging/__init__.py Misc/NEWS description: Issue #21709: Fix the logging module to not depend upon __file__ being set properly to get the filename of its caller from the stack. This allows it to work if run in a frozen or embedded environment where the module's .__file__ attribute does not match its code object's .co_filename. This same much simpler always correct approach has already been deployed and used widely in Python 3.4 per the issue referenced above. diff -r a96e39e20490 -r da971f467f6e Lib/logging/__init__.py --- a/Lib/logging/__init__.py Thu Oct 22 03:27:27 2015 -0400 +++ b/Lib/logging/__init__.py Thu Oct 22 13:09:50 2015 -0700 @@ -59,18 +59,6 @@ except NameError: _unicode = False -# -# _srcfile is used when walking the stack to check when we've got the first -# caller stack frame. -# -if hasattr(sys, 'frozen'): #support for py2exe - _srcfile = "logging%s__init__%s" % (os.sep, __file__[-4:]) -elif __file__[-4:].lower() in ['.pyc', '.pyo']: - _srcfile = __file__[:-4] + '.py' -else: - _srcfile = __file__ -_srcfile = os.path.normcase(_srcfile) - # next bit filched from 1.5.2's inspect.py def currentframe(): """Return the frame object for the caller's stack frame.""" @@ -82,6 +70,12 @@ if hasattr(sys, '_getframe'): currentframe = lambda: sys._getframe(3) # done filching +# +# _srcfile is used when walking the stack to check when we've got the first +# caller stack frame. +# +_srcfile = currentframe.__code__.co_filename + # _srcfile is only used in conjunction with sys._getframe(). # To provide compatibility with older versions of Python, set _srcfile # to None if _getframe() is not available; this value will prevent diff -r a96e39e20490 -r da971f467f6e Misc/NEWS --- a/Misc/NEWS Thu Oct 22 03:27:27 2015 -0400 +++ b/Misc/NEWS Thu Oct 22 13:09:50 2015 -0700 @@ -46,6 +46,11 @@ Library ------- +- Issue #21709: Fix the logging module to not depend upon __file__ being set + properly to get the filename of its caller from the stack. This allows it + to work if run in a frozen or embedded environment where the module's + .__file__ attribute does not match its code object's .co_filename. + - Issue #25319: When threading.Event is reinitialized, the underlying condition should use a regular lock rather than a recursive lock.