From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 11 Jun 2014 07:01:32 +0000 (+0100)
Subject: Issue #21709: Remove references to __file__ when part of a frozen application.
X-Git-Tag: v3.4.2rc1~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80f2262dcf6c15dea8308ba976d2b05cc4bbfaed;p=thirdparty%2FPython%2Fcpython.git

Issue #21709: Remove references to __file__ when part of a frozen application.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index dcfd9f690a4e..21ab627c0138 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)