Subsumed mappingobject.h in dictobject.h.

gvanrossum · gvanrossum · commit 2ec9031b5589 · 1997-05-13T21:23:32.000Z
diff --git a/Include/Python.h b/Include/Python.h
@@ -74,7 +74,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "stringobject.h"
 #include "tupleobject.h"
 #include "listobject.h"
-#include "mappingobject.h"
+#include "dictobject.h"
 #include "methodobject.h"
 #include "moduleobject.h"
 #include "funcobject.h"
diff --git a/Include/dictobject.h b/Include/dictobject.h
@@ -35,9 +35,27 @@ PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-/* All in the sake of backward compatibility... */
-
-#include "mappingobject.h"
+/* Dictionary object type -- mapping from hashable object to object */
+
+extern DL_IMPORT(PyTypeObject) PyDict_Type;
+
+#define PyDict_Check(op) ((op)->ob_type == &PyDict_Type)
+
+extern PyObject *PyDict_New Py_PROTO((void));
+extern PyObject *PyDict_GetItem Py_PROTO((PyObject *mp, PyObject *key));
+extern int PyDict_SetItem Py_PROTO((PyObject *mp, PyObject *key, PyObject *item));
+extern int PyDict_DelItem Py_PROTO((PyObject *mp, PyObject *key));
+extern void PyDict_Clear Py_PROTO((PyObject *mp));
+extern int PyDict_Next
+	Py_PROTO((PyObject *mp, int *pos, PyObject **key, PyObject **value));
+extern PyObject *PyDict_Keys Py_PROTO((PyObject *mp));
+extern PyObject *PyDict_Values Py_PROTO((PyObject *mp));
+extern PyObject *PyDict_Items Py_PROTO((PyObject *mp));
+extern int PyDict_Size Py_PROTO((PyObject *mp));
+
+extern PyObject *PyDict_GetItemString Py_PROTO((PyObject *dp, char *key));
+extern int PyDict_SetItemString Py_PROTO((PyObject *dp, char *key, PyObject *item));
+extern int PyDict_DelItemString Py_PROTO((PyObject *dp, char *key));
 
 #ifdef __cplusplus
 }
diff --git a/Include/mappingobject.h b/Include/mappingobject.h
