mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-25 04:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Ellipses -> Ellipsis rename (the dictionary really says that it should

Browse source 
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.
This commit is contained in:
Guido van Rossum 1996-10-11 16:25:41 +00:00
parent 8741b2b988
commit e449af7da9
7 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/bltinmodule.c
View file

@ -1632,7 +1632,9 @@ initbuiltin()
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);
}

2
Python/compile.c
View file

@ -1032,7 +1032,7 @@ com_subscript(c, n)
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))

12
Python/marshal.c
View file

@ -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));