Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.4 branch.

This commit is contained in:
doko@ubuntu.com 2014-04-15 20:38:28 +02:00
parent 02d23a212a 9574355ff3
commit a3b99a07e6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_site.py
View File

@ -459,7 +459,8 @@ class StartupImportTests(unittest.TestCase):
# http://bugs.python.org/issue19218> # http://bugs.python.org/issue19218>
collection_mods = {'_collections', 'collections', 'functools', collection_mods = {'_collections', 'collections', 'functools',
'heapq', 'itertools', 'keyword', 'operator', 'heapq', 'itertools', 'keyword', 'operator',
'reprlib', 'types', 'weakref'} 'reprlib', 'types', 'weakref'
}.difference(sys.builtin_module_names)
self.assertFalse(modules.intersection(collection_mods), stderr) self.assertFalse(modules.intersection(collection_mods), stderr)

3
Misc/NEWS
View File

@ -255,6 +255,9 @@ Documentation
Tests 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. - Issue #20635: Added tests for Tk geometry managers.
- Add test case for freeze. - Add test case for freeze.