Mercurial > cpython-lru_cache-weakref
diff Python/marshal.c @ 18148:7bc473b2c654 legacy-trunk
Merging the gen-branch into the main line, at Guido's direction. Yay!
Bugfix candidate in inspect.py: it was referencing "self" outside of
a method.
| author | Tim Peters <tim.peters@gmail.com> |
|---|---|
| date | Mon, 18 Jun 2001 22:08:13 +0000 |
| parents | fe4c1034b480 |
| children | 7257e87e0720 |
line wrap: on
line diff
--- a/Python/marshal.c Mon Jun 18 19:21:11 2001 +0000 +++ b/Python/marshal.c Mon Jun 18 22:08:13 2001 +0000 @@ -17,6 +17,7 @@ #define TYPE_NULL '0' #define TYPE_NONE 'N' +#define TYPE_STOPITER 'S' #define TYPE_ELLIPSIS '.' #define TYPE_INT 'i' #define TYPE_INT64 'I' @@ -120,6 +121,9 @@ else if (v == Py_None) { w_byte(TYPE_NONE, p); } + else if (v == PyExc_StopIteration) { + w_byte(TYPE_STOPITER, p); + } else if (v == Py_Ellipsis) { w_byte(TYPE_ELLIPSIS, p); } @@ -376,6 +380,10 @@ Py_INCREF(Py_None); return Py_None; + case TYPE_STOPITER: + Py_INCREF(PyExc_StopIteration); + return PyExc_StopIteration; + case TYPE_ELLIPSIS: Py_INCREF(Py_Ellipsis); return Py_Ellipsis;