summaryrefslogtreecommitdiffstats
path: root/Python/marshal.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-10-11 16:25:41 (GMT)
committerGuido van Rossum <guido@python.org>1996-10-11 16:25:41 (GMT)
commite449af7da940d353a54036fb72e7405d2da362e3 (patch)
tree006a8ff9abc9d4639bf098ce59794dae9c7adf61 /Python/marshal.c
parent8741b2b98861d9ffcc9d4fa211d278ba62c9109e (diff)
downloadcpython-e449af7da940d353a54036fb72e7405d2da362e3.zip
cpython-e449af7da940d353a54036fb72e7405d2da362e3.tar.gz
cpython-e449af7da940d353a54036fb72e7405d2da362e3.tar.bz2
Ellipses -> Ellipsis rename (the dictionary really says that it should
be Ellipsis!). Bumped the API version because a linker-visible symbol is affected. Old C code will still compile -- there's a b/w compat macro. Similarly, old Python code will still run, builtin exports both Ellipses and Ellipsis.
Diffstat (limited to 'Python/marshal.c')
-rw-r--r--Python/marshal.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index 08ad790..2cd54c6 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -37,7 +37,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define TYPE_NULL '0'
#define TYPE_NONE 'N'
-#define TYPE_ELLIPSES '.'
+#define TYPE_ELLIPSIS '.'
#define TYPE_INT 'i'
#define TYPE_FLOAT 'f'
#define TYPE_COMPLEX 'x'
@@ -130,8 +130,8 @@ w_object(v, p)
w_byte(TYPE_NULL, p);
else if (v == None)
w_byte(TYPE_NONE, p);
- else if (v == Py_Ellipses)
- w_byte(TYPE_ELLIPSES, p);
+ else if (v == Py_Ellipsis)
+ w_byte(TYPE_ELLIPSIS, p);
else if (is_intobject(v)) {
w_byte(TYPE_INT, p);
w_long(getintvalue(v), p);
@@ -325,9 +325,9 @@ r_object(p)
INCREF(None);
return None;
- case TYPE_ELLIPSES:
- INCREF(Py_Ellipses);
- return Py_Ellipses;
+ case TYPE_ELLIPSIS:
+ INCREF(Py_Ellipsis);
+ return Py_Ellipsis;
case TYPE_INT:
return newintobject(r_long(p));