mirror of
https://github.com/python/cpython.git
synced 2025-07-28 21:55:21 +00:00
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
This commit is contained in:
parent
9ada3d6e29
commit
49fd7fa443
640 changed files with 52240 additions and 18408 deletions
|
@ -136,7 +136,7 @@ class RExec(ihooks._Verbose):
|
|||
ok_builtin_modules = ('audioop', 'array', 'binascii',
|
||||
'cmath', 'errno', 'imageop',
|
||||
'marshal', 'math', 'md5', 'operator',
|
||||
'parser', 'regex', 'select',
|
||||
'parser', 'select',
|
||||
'sha', '_sre', 'strop', 'struct', 'time',
|
||||
'_weakref')
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue