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/future.c b/Python/future.c
index 1902f1d..d23fad6 100644
--- a/Python/future.c
+++ b/Python/future.c
@@ -19,7 +19,7 @@
names = s->v.ImportFrom.names;
for (i = 0; i < asdl_seq_LEN(names); i++) {
- alias_ty name = asdl_seq_GET(names, i);
+ alias_ty name = (alias_ty)asdl_seq_GET(names, i);
const char *feature = PyString_AsString(name->name);
if (!feature)
return 0;
@@ -29,7 +29,7 @@
continue;
} else if (strcmp(feature, FUTURE_DIVISION) == 0) {
continue;
- } else if (strcmp(feature, FUTURE_ABSIMPORT) == 0) {
+ } else if (strcmp(feature, FUTURE_ABSOLUTE_IMPORT) == 0) {
continue;
} else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) {
continue;
@@ -73,7 +73,7 @@
for (i = 0; i < asdl_seq_LEN(mod->v.Module.body); i++) {
- stmt_ty s = asdl_seq_GET(mod->v.Module.body, i);
+ stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
if (done && s->lineno > prev_line)
return 1;
@@ -120,14 +120,14 @@
{
PyFutureFeatures *ff;
- ff = (PyFutureFeatures *)PyMem_Malloc(sizeof(PyFutureFeatures));
+ ff = (PyFutureFeatures *)PyObject_Malloc(sizeof(PyFutureFeatures));
if (ff == NULL)
return NULL;
ff->ff_features = 0;
ff->ff_lineno = -1;
if (!future_parse(ff, mod, filename)) {
- PyMem_Free((void *)ff);
+ PyObject_Free(ff);
return NULL;
}
return ff;