changeset:   90328:ebb9595af548
branch:      3.4
parent:      90324:2729823525fe
user:        doko@ubuntu.com
date:        Tue Apr 15 20:37:54 2014 +0200
files:       Lib/test/test_site.py Misc/NEWS
description:
- Issue #21223: Pass test_site/test_startup_imports when some of the extensions
  are built as builtins.


diff -r 2729823525fe -r ebb9595af548 Lib/test/test_site.py
--- a/Lib/test/test_site.py	Tue Apr 15 12:01:16 2014 -0400
+++ b/Lib/test/test_site.py	Tue Apr 15 20:37:54 2014 +0200
@@ -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 -r 2729823525fe -r ebb9595af548 Misc/NEWS
--- a/Misc/NEWS	Tue Apr 15 12:01:16 2014 -0400
+++ b/Misc/NEWS	Tue Apr 15 20:37:54 2014 +0200
@@ -190,6 +190,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.