summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-10-08 01:45:47 (GMT)
committerGuido van Rossum <guido@python.org>1998-10-08 01:45:47 (GMT)
commit5bd893b1ea660d542e6d2df93af0b237b3d34e79 (patch)
tree92f1c3398c8c5d0416f82754ffe3a5df6d7b3a6e
parent0f8b30f8ce795c62b81ad5a922c8c3f232e7784a (diff)
downloadcpython-5bd893b1ea660d542e6d2df93af0b237b3d34e79.zip
cpython-5bd893b1ea660d542e6d2df93af0b237b3d34e79.tar.gz
cpython-5bd893b1ea660d542e6d2df93af0b237b3d34e79.tar.bz2
The previous checkin contained an experiment of Greg Stein's that wasn't
meant for checkin, and which broke marshal.loads().
-rw-r--r--Python/marshal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index df7f51c..ddccc89 100644
--- 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;