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.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index c1c3ed9..cd3d05f 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1632,7 +1632,9 @@
INCREF(builtin_dict);
initerrors();
(void) dictinsert(builtin_dict, "None", None);
- (void) dictinsert(builtin_dict, "Ellipses", Py_Ellipses);
+ (void) dictinsert(builtin_dict, "Ellipsis", Py_Ellipsis);
+ /* And once more for bad spellers like me :-( */
+ (void) dictinsert(builtin_dict, "Ellipses", Py_Ellipsis);
}
diff --git a/Python/compile.c b/Python/compile.c
index 60bfd6f..88b6710 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1032,7 +1032,7 @@
ch = CHILD(n,0);
/* check for rubber index */
if (TYPE(ch) == DOT && TYPE(CHILD(n,1)) == DOT)
- com_addoparg(c, LOAD_CONST, com_addconst(c, Py_Ellipses));
+ com_addoparg(c, LOAD_CONST, com_addconst(c, Py_Ellipsis));
else {
/* check for slice */
if ((TYPE(ch) == COLON || NCH(n) > 1))
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 @@
#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_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 @@
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));