summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2009-01-27 10:03:04 (GMT)
committerRaymond Hettinger <python@rcn.com>2009-01-27 10:03:04 (GMT)
commitecf252abac71be8bcf7c4daa8f3a8ca6acd15b0c (patch)
treea1ed4590cf6de37cedffbdae04d0ad6d6a91f824
parentf93f3032c63906d0a6516d6e75985f0d425f36f5 (diff)
downloadcpython-ecf252abac71be8bcf7c4daa8f3a8ca6acd15b0c.zip
cpython-ecf252abac71be8bcf7c4daa8f3a8ca6acd15b0c.tar.gz
cpython-ecf252abac71be8bcf7c4daa8f3a8ca6acd15b0c.tar.bz2
Issue 5021: doctest.testfile should set __name__
-rw-r--r--Lib/collections.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/collections.py b/Lib/collections.py
index effae7d..0fddb97 100644
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -109,7 +109,7 @@ def namedtuple(typename, field_names, verbose=False):
# where the named tuple is created. Bypass this step in enviroments where
# sys._getframe is not defined (Jython for example).
if hasattr(_sys, '_getframe'):
- result.__module__ = _sys._getframe(1).f_globals['__name__']
+ result.__module__ = _sys._getframe(1).f_globals.get('__name__', '__main__')
return result
diff --git a/Misc/NEWS b/Misc/NEWS
index bb1aeac..2fe1082 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -145,6 +145,9 @@ Core and Builtins
Library
-------
+- Issue 5021: doctest.testfile() did not create __name__ and
+ collections.namedtuple() relied on __name__ being defined.
+
- Backport importlib from Python 3.1. Only the import_module() function has
been backported to help facilitate transitions from 2.7 to 3.1.