[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 branch.

[matthias.klose]

http://hg.python.org/cpython/rev/795d90c7820d
changeset:   90329:795d90c7820d
parent:      90327:56e7fa27f979
parent:      90328:ebb9595af548
user:        doko at ubuntu.com
date:        Tue Apr 15 20:38:28 2014 +0200
summary:
  Merge 3.4 branch.

files:
  Lib/test/test_site.py |  3 ++-
  Misc/NEWS             |  3 +++
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -459,7 +459,8 @@
         # http://bugs.python.org/issue19218>
         collection_mods = {'_collections', 'collections', 'functools',
                            'heapq', 'itertools', 'keyword', 'operator',
-                           'reprlib', 'types', 'weakref'}
+                           'reprlib', 'types', 'weakref'
+                          }.difference(sys.builtin_module_names)
         self.assertFalse(modules.intersection(collection_mods), stderr)
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -255,6 +255,9 @@
 Tests
 -----
 
+- Issue #21223: Pass test_site/test_startup_imports when some of the extensions
+  are built as builtins.
+
 - Issue #20635: Added tests for Tk geometry managers.
 
 - Add test case for freeze.

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