diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-15 18:38:28 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-15 18:38:28 (GMT) |
| commit | a3b99a07e6d75d707b5c8a0cadb6b059638da650 (patch) | |
| tree | 1dc662064ca3901c54bc60994c6a98a448ffd918 | |
| parent | 02d23a212a1e8e45a29e06d3f91e119610b682a3 (diff) | |
| parent | 9574355ff3cffde2dc67ee60a61e468cec1d46f7 (diff) | |
| download | cpython-a3b99a07e6d75d707b5c8a0cadb6b059638da650.zip cpython-a3b99a07e6d75d707b5c8a0cadb6b059638da650.tar.gz cpython-a3b99a07e6d75d707b5c8a0cadb6b059638da650.tar.bz2 | |
Merge 3.4 branch.
| -rw-r--r-- | Lib/test/test_site.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index b32aef1..8325222 100644 --- 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) @@ -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. |