[Python-checkins] cpython (merge 3.4 -> default): Closes #21709: Merged fix from 3.4.

[vinay.sajip]

http://hg.python.org/cpython/rev/149cc6364180
changeset:   91126:149cc6364180
parent:      91124:55c50c570098
parent:      91125:11a920a26f13
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Wed Jun 11 08:04:16 2014 +0100
summary:
  Closes #21709: Merged fix from 3.4.

files:
  Lib/logging/__init__.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -55,8 +55,8 @@
 # _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:])
+if hasattr(sys, 'frozen'):
+    _srcfile = os.path.join('logging', '__init__.py')
 else:
     _srcfile = __file__
 _srcfile = os.path.normcase(_srcfile)

-- 
Repository URL: http://hg.python.org/cpython