Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

10
PCbuild/pythoncore.vcproj
View file

@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="pythoncore"
ProjectGUID="{7AFA1F0B-A8A1-455A-A832-BF263404BBEF}"
ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
RootNamespace="pythoncore"
SccProjectName="pythoncore"
SccLocalPath="..">
@ -623,7 +623,7 @@
RelativePath="..\Modules\mathmodule.c">
</File>
<File
RelativePath="..\Modules\md5c.c">
RelativePath="..\Modules\md5.c">
</File>
<File
RelativePath="..\Modules\md5module.c">
@ -706,12 +706,6 @@
<File
RelativePath="..\Objects\rangeobject.c">
</File>
<File
RelativePath="..\Modules\regexmodule.c">
</File>
<File
RelativePath="..\Modules\regexpr.c">
</File>
<File
RelativePath="..\Modules\rgbimgmodule.c">
</File>