The previous checkin contained an experiment of Greg Stein's that wasn't

meant for checkin, and which broke marshal.loads().

diff --git a/Python/marshal.c b/Python/marshal.c
index df7f51c867578f17e65b65ce9e64d801a25b9616..ddccc89c23297f8a42967c27d582f8b10c43341f 100644 (file)
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -743,7 +743,7 @@ marshal_loads(self, args)
        PyObject *v;
        char *s;
        int n;
-       if (!PyArg_Parse(args, "r#", &s, &n))
+       if (!PyArg_Parse(args, "s#", &s, &n))
                return NULL;
        rf.fp = NULL;
        rf.str = args;