diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:15:12 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:15:12 (GMT) |
| commit | bee325387b21b859054002a052149646399b52de (patch) | |
| tree | 76d4edea625f87c01c50e3ac4d63d5582107868c /Objects | |
| parent | d8b690f7ae57169d95f1cb4b3a0bccf5adfe6a30 (diff) | |
| download | cpython-bee325387b21b859054002a052149646399b52de.zip cpython-bee325387b21b859054002a052149646399b52de.tar.gz cpython-bee325387b21b859054002a052149646399b52de.tar.bz2 | |
Merged revisions 63361-63373,63375,63377-63380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63361 | alexandre.vassalotti | 2008-05-16 03:14:08 -0400 (Fri, 16 May 2008) | 2 lines
Rename the test file of reprlib.
........
r63364 | georg.brandl | 2008-05-16 05:34:48 -0400 (Fri, 16 May 2008) | 2 lines
Make generator repr consistent with function and code object repr.
........
r63365 | georg.brandl | 2008-05-16 05:47:29 -0400 (Fri, 16 May 2008) | 2 lines
#2869: remove parameter from signature.
........
r63366 | christian.heimes | 2008-05-16 06:23:31 -0400 (Fri, 16 May 2008) | 1 line
Fixed #2870: cmathmodule.c compile error
........
r63367 | christian.heimes | 2008-05-16 07:28:56 -0400 (Fri, 16 May 2008) | 1 line
Following Amaury's advice
........
r63368 | georg.brandl | 2008-05-16 09:10:15 -0400 (Fri, 16 May 2008) | 2 lines
#2890: support os.O_ASYNC and fcntl.FASYNC.
........
r63369 | georg.brandl | 2008-05-16 09:18:50 -0400 (Fri, 16 May 2008) | 2 lines
#2845: fix copy2's docs.
........
r63370 | georg.brandl | 2008-05-16 09:24:29 -0400 (Fri, 16 May 2008) | 2 lines
Don't allow keyword arguments to reversed().
........
r63373 | georg.brandl | 2008-05-16 09:41:26 -0400 (Fri, 16 May 2008) | 2 lines
Document O_ASYNC addition.
........
r63380 | georg.brandl | 2008-05-16 13:33:13 -0400 (Fri, 16 May 2008) | 2 lines
Fix reprlib docs.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/enumobject.c | 5 | ||||
| -rw-r--r-- | Objects/genobject.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Objects/enumobject.c b/Objects/enumobject.c index 5c60d8c..c1a1872 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -217,7 +217,10 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyObject *seq; reversedobject *ro; - if (!PyArg_UnpackTuple(args, "reversed", 1, 1, &seq)) + if (type == &PyReversed_Type && !_PyArg_NoKeywords("reversed()", kwds)) + return NULL; + + if (!PyArg_UnpackTuple(args, "reversed", 1, 1, &seq) ) return NULL; if (PyObject_HasAttrString(seq, "__reversed__")) diff --git a/Objects/genobject.c b/Objects/genobject.c index c76bcb6..72ddaef 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -285,7 +285,7 @@ gen_iternext(PyGenObject *gen) static PyObject * gen_repr(PyGenObject *gen) { - return PyUnicode_FromFormat("<%S generator object at %p>", + return PyUnicode_FromFormat("<generator object %S at %p>", ((PyCodeObject *)gen->gi_code)->co_name, gen); } |