mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge p3yk branch with the trunk up to revision 45595. This breaks a fair

Browse source 
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:
Thomas Wouters 2006-04-21 10:40:58 +00:00
parent 9ada3d6e29
commit 49fd7fa443
640 changed files with 52240 additions and 18408 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_descr.py
View file

@ -1638,7 +1638,9 @@ def specials():
c1 = C()
c2 = C()
verify(not not c1)
vereq(hash(c1), id(c1))
verify(id(c1) != id(c2))
hash(c1)
hash(c2)
vereq(cmp(c1, c2), cmp(id(c1), id(c2)))
vereq(c1, c1)
verify(c1 != c2)
@ -1660,7 +1662,9 @@ def specials():
d1 = D()
d2 = D()
verify(not not d1)
vereq(hash(d1), id(d1))
verify(id(d1) != id(d2))
hash(d1)
hash(d2)
vereq(cmp(d1, d2), cmp(id(d1), id(d2)))
vereq(d1, d1)
verify(d1 != d2)
@ -2914,7 +2918,7 @@ def subclasspropagation():
class D(B, C):
pass
d = D()
vereq(hash(d), id(d))
orig_hash = hash(d) # related to id(d) in platform-dependent ways
A.__hash__ = lambda self: 42
vereq(hash(d), 42)
C.__hash__ = lambda self: 314
@ -2930,7 +2934,7 @@ def subclasspropagation():
del C.__hash__
vereq(hash(d), 42)
del A.__hash__
vereq(hash(d), id(d))
vereq(hash(d), orig_hash)
d.foo = 42
d.bar = 42
vereq(d.foo, 42)