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/errors.c b/Python/errors.c
index 67f86ed..2ae062f 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -16,6 +16,11 @@
#include <ctype.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
void
PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback)
{
@@ -609,6 +614,7 @@
PyFile_WriteString(": ", f);
PyFile_WriteObject(v, f, 0);
}
+ Py_XDECREF(moduleName);
}
PyFile_WriteString(" in ", f);
PyFile_WriteObject(obj, f, 0);
@@ -796,3 +802,8 @@
}
return NULL;
}
+
+#ifdef __cplusplus
+}
+#endif
+