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.
diff --git a/Python/graminit.c b/Python/graminit.c
index 40f1770..a6ac124 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -1675,7 +1675,7 @@
{91, 1},
};
static arc arcs_77_1[1] = {
- {26, 2},
+ {105, 2},
};
static arc arcs_77_2[2] = {
{162, 3},
@@ -1732,7 +1732,7 @@
{91, 1},
};
static arc arcs_80_1[1] = {
- {26, 2},
+ {105, 2},
};
static arc arcs_80_2[2] = {
{164, 3},