changeset:   89901:42ae7b2524a2
parent:      89899:455e5385752a
parent:      89900:b5b81a3eb6e6
user:        Brett Cannon <brett@python.org>
date:        Fri Mar 21 11:01:02 2014 -0400
files:       Misc/NEWS
description:
Merge for issue #20884


diff -r 455e5385752a -r 42ae7b2524a2 Lib/importlib/__init__.py
--- a/Lib/importlib/__init__.py	Fri Mar 21 10:52:33 2014 -0400
+++ b/Lib/importlib/__init__.py	Fri Mar 21 11:01:02 2014 -0400
@@ -22,7 +22,12 @@
     # a second copy of the module.
     _bootstrap.__name__ = 'importlib._bootstrap'
     _bootstrap.__package__ = 'importlib'
-    _bootstrap.__file__ = __file__.replace('__init__.py', '_bootstrap.py')
+    try:
+        _bootstrap.__file__ = __file__.replace('__init__.py', '_bootstrap.py')
+    except NameError:
+        # __file__ is not guaranteed to be defined, e.g. if this code gets
+        # frozen by a tool like cx_Freeze.
+        pass
     sys.modules['importlib._bootstrap'] = _bootstrap
 
 # To simplify imports in test code