summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2014-06-11 07:04:16 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2014-06-11 07:04:16 (GMT)
commit99537627fd11d4ebf7379cbb732ba616d15bb4a4 (patch)
tree2c60b8b1355cf89043c9a8caf76a63874f7c20fb /Lib/logging
parentec87a13e5d6749cb79b75be0e8ef1525dbe6ca3e (diff)
parent80f2262dcf6c15dea8308ba976d2b05cc4bbfaed (diff)
downloadcpython-99537627fd11d4ebf7379cbb732ba616d15bb4a4.zip
cpython-99537627fd11d4ebf7379cbb732ba616d15bb4a4.tar.gz
cpython-99537627fd11d4ebf7379cbb732ba616d15bb4a4.tar.bz2
Closes #21709: Merged fix from 3.4.
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index dcfd9f6..21ab627 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -55,8 +55,8 @@ __date__ = "07 February 2010"
# _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)