Constify char* API. Fixes #651363. 2.2 candidate.

diff --git a/Include/dictobject.h b/Include/dictobject.h
index 36053e83ee63828654258ac611ce1f87dbb6c184..d3a0fc5b388b2ce06f943ba47a105c1eed1caa25 100644 (file)
--- a/Include/dictobject.h
+++ b/Include/dictobject.h
@@ -116,9 +116,9 @@ PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d,
                                           PyObject *seq2,
                                           int override);
 
-PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, char *key);
-PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, char *key, PyObject *item);
-PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, char *key);
+PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key);
+PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item);
+PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key);
 
 #ifdef __cplusplus
 }

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 712ec2ccc99479f9440fdbce51e1dd29ce0acdb2..5e39dfa96793f66fc6a26178bd8185e5e933c2ce 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1919,7 +1919,7 @@ PyTypeObject PyDict_Type = {
 /* For backward compatibility with old dictionary interface */
 
 PyObject *
-PyDict_GetItemString(PyObject *v, char *key)
+PyDict_GetItemString(PyObject *v, const char *key)
 {
        PyObject *kv, *rv;
        kv = PyString_FromString(key);
@@ -1931,7 +1931,7 @@ PyDict_GetItemString(PyObject *v, char *key)
 }
 
 int
-PyDict_SetItemString(PyObject *v, char *key, PyObject *item)
+PyDict_SetItemString(PyObject *v, const char *key, PyObject *item)
 {
        PyObject *kv;
        int err;
@@ -1945,7 +1945,7 @@ PyDict_SetItemString(PyObject *v, char *key, PyObject *item)
 }
 
 int
-PyDict_DelItemString(PyObject *v, char *key)
+PyDict_DelItemString(PyObject *v, const char *key)
 {
        PyObject *kv;
        int err;