Merge 3.4 branch.

2014-04-15 20:38:28 +02:00 · 2014-04-15 20:38:28 +02:00 · a3b99a07e6
parent 02d23a212a 9574355ff3
commit a3b99a07e6
2 changed files with 5 additions and 1 deletions
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@ -459,7 +459,8 @@ class StartupImportTests(unittest.TestCase):
        # 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)


--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -255,6 +255,9 @@ Documentation
 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.