summaryrefslogtreecommitdiffstats
path: root/Include
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 /Include
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 'Include')
-rw-r--r--Include/modsupport.h6
-rw-r--r--Include/sliceobject.h8
2 files changed, 8 insertions, 6 deletions
diff --git a/Include/modsupport.h b/Include/modsupport.h
index 4d26523..b3b30ee 100644
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -52,8 +52,8 @@ extern PyObject *Py_BuildValue();
extern int PyArg_VaParse Py_PROTO((PyObject *, char *, va_list));
extern PyObject *Py_VaBuildValue Py_PROTO((char *, va_list));
-#define PYTHON_API_VERSION 1005
-#define PYTHON_API_STRING "1005"
+#define PYTHON_API_VERSION 1006
+#define PYTHON_API_STRING "1006"
/* The API version is maintained (independently from the Python version)
so we can detect mismatches between the interpreter and dynamically
loaded modules. These are diagnosticised by an error message but
@@ -67,6 +67,8 @@ extern PyObject *Py_VaBuildValue Py_PROTO((char *, va_list));
Please add a line or two to the top of this log for each API
version change:
+ 11-Oct-1996 GvR renamed Py_Ellipses to Py_Ellipsis :-(
+
30-Jul-1996 GvR Slice and ellipses syntax added
23-Jul-1996 GvR For 1.4 -- better safe than sorry this time :-)
diff --git a/Include/sliceobject.h b/Include/sliceobject.h
index ac7cd13..6ee4698 100644
--- a/Include/sliceobject.h
+++ b/Include/sliceobject.h
@@ -4,12 +4,12 @@
extern "C" {
#endif
-/* The unique ellipses object "..." */
+/* The unique ellipsis object "..." */
-extern DL_IMPORT(PyObject) _Py_EllipsesObject; /* Don't use this directly */
-
-#define Py_Ellipses (&_Py_EllipsesObject)
+extern DL_IMPORT(PyObject) _Py_EllipsisObject; /* Don't use this directly */
+#define Py_Ellipsis (&_Py_EllipsisObject)
+#define Py_Ellipses Py_Ellipsis /* For bad spellers like me :-( */
/* Slice object interface */