Revert backwards-incompatible const changes.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 4c03602..71d7a69 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1886,7 +1886,7 @@
int err;
char* termstr = NULL;
- static const char *kwlist[] = {"term", "fd", NULL};
+ static char *kwlist[] = {"term", "fd", NULL};
if (!PyArg_ParseTupleAndKeywords(
args, keywds, "|zi:setupterm", kwlist, &termstr, &fd)) {
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 9bdd274..117cc4d 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -234,7 +234,7 @@
static int
EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds)
{
- static const char *kwlist[] = {"name", "string", NULL};
+ static char *kwlist[] = {"name", "string", NULL};
PyObject *name_obj = NULL;
char *nameStr;
unsigned char *cp = NULL;
@@ -370,7 +370,7 @@
static PyObject *
EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
{
- static const char *kwlist[] = {"name", "string", NULL};
+ static char *kwlist[] = {"name", "string", NULL};
PyObject *name_obj = NULL;
char *name;
const EVP_MD *digest;
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 8b74e38..8ffdf23 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -675,7 +675,7 @@
{
int subcalls = -1;
int builtins = -1;
- static const char *kwlist[] = {"subcalls", "builtins", 0};
+ static char *kwlist[] = {"subcalls", "builtins", 0};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ii:enable",
kwlist, &subcalls, &builtins))
return NULL;
@@ -758,7 +758,7 @@
#else
int builtins = 0;
#endif
- static const char *kwlist[] = {"timer", "timeunit",
+ static char *kwlist[] = {"timer", "timeunit",
"subcalls", "builtins", 0};
if (!PyArg_ParseTupleAndKeywords(args, kw, "|Odii:Profiler", kwlist,
diff --git a/Modules/_sre.c b/Modules/_sre.c
index 3cc90d4..fb73f7f 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -2010,7 +2010,7 @@
PyObject* string;
int start = 0;
int end = INT_MAX;
- static const char* kwlist[] = { "pattern", "pos", "endpos", NULL };
+ static char* kwlist[] = { "pattern", "pos", "endpos", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "O|ii:match", kwlist,
&string, &start, &end))
return NULL;
@@ -2047,7 +2047,7 @@
PyObject* string;
int start = 0;
int end = INT_MAX;
- static const char* kwlist[] = { "pattern", "pos", "endpos", NULL };
+ static char* kwlist[] = { "pattern", "pos", "endpos", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "O|ii:search", kwlist,
&string, &start, &end))
return NULL;
@@ -2188,7 +2188,7 @@
PyObject* string;
int start = 0;
int end = INT_MAX;
- static const char* kwlist[] = { "source", "pos", "endpos", NULL };
+ static char* kwlist[] = { "source", "pos", "endpos", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "O|ii:findall", kwlist,
&string, &start, &end))
return NULL;
@@ -2314,7 +2314,7 @@
PyObject* string;
int maxsplit = 0;
- static const char* kwlist[] = { "source", "maxsplit", NULL };
+ static char* kwlist[] = { "source", "maxsplit", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "O|i:split", kwlist,
&string, &maxsplit))
return NULL;
@@ -2598,7 +2598,7 @@
PyObject* template;
PyObject* string;
int count = 0;
- static const char* kwlist[] = { "repl", "string", "count", NULL };
+ static char* kwlist[] = { "repl", "string", "count", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|i:sub", kwlist,
&template, &string, &count))
return NULL;
@@ -2612,7 +2612,7 @@
PyObject* template;
PyObject* string;
int count = 0;
- static const char* kwlist[] = { "repl", "string", "count", NULL };
+ static char* kwlist[] = { "repl", "string", "count", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|i:subn", kwlist,
&template, &string, &count))
return NULL;
@@ -2919,7 +2919,7 @@
int index;
PyObject* def = Py_None;
- static const char* kwlist[] = { "default", NULL };
+ static char* kwlist[] = { "default", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "|O:groups", kwlist, &def))
return NULL;
@@ -2948,7 +2948,7 @@
int index;
PyObject* def = Py_None;
- static const char* kwlist[] = { "default", NULL };
+ static char* kwlist[] = { "default", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kw, "|O:groupdict", kwlist, &def))
return NULL;
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 4a2c268..3b9a44f 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -1032,7 +1032,7 @@
unsigned char *data, *odata;
unsigned int datalen = 0;
PyObject *rv;
- static const char *kwlist[] = {"data", "header", NULL};
+ static char *kwlist[] = {"data", "header", NULL};
int header = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|i", kwlist, &data,
@@ -1133,7 +1133,7 @@
unsigned int datalen = 0, odatalen = 0;
PyObject *rv;
unsigned int linelen = 0;
- static const char *kwlist[] = {"data", "quotetabs", "istext",
+ static char *kwlist[] = {"data", "quotetabs", "istext",
"header", NULL};
int istext = 1;
int quotetabs = 0;
diff --git a/Modules/bz2module.c b/Modules/bz2module.c
index c8fab7a..ed329b8 100644
--- a/Modules/bz2module.c
+++ b/Modules/bz2module.c
@@ -1275,7 +1275,7 @@
static int
BZ2File_init(BZ2FileObject *self, PyObject *args, PyObject *kwargs)
{
- static const char *kwlist[] = {"filename", "mode", "buffering",
+ static char *kwlist[] = {"filename", "mode", "buffering",
"compresslevel", 0};
PyObject *name;
char *mode = "r";
@@ -1664,7 +1664,7 @@
{
int compresslevel = 9;
int bzerror;
- static const char *kwlist[] = {"compresslevel", 0};
+ static char *kwlist[] = {"compresslevel", 0};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i:BZ2Compressor",
kwlist, &compresslevel))
@@ -2009,7 +2009,7 @@
bz_stream _bzs;
bz_stream *bzs = &_bzs;
int bzerror;
- static const char *kwlist[] = {"data", "compresslevel", 0};
+ static char *kwlist[] = {"data", "compresslevel", 0};
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|i",
kwlist, &data, &datasize,
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index cb14627..727dcc9 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -2868,7 +2868,7 @@
static PyObject *
get_Pickler(PyObject *self, PyObject *args, PyObject *kwds)
{
- static const char *kwlist[] = {"file", "protocol", NULL};
+ static char *kwlist[] = {"file", "protocol", NULL};
PyObject *file = NULL;
int proto = 0;
@@ -5388,7 +5388,7 @@
static PyObject *
cpm_dump(PyObject *self, PyObject *args, PyObject *kwds)
{
- static const char *kwlist[] = {"obj", "file", "protocol", NULL};
+ static char *kwlist[] = {"obj", "file", "protocol", NULL};
PyObject *ob, *file, *res = NULL;
Picklerobject *pickler = 0;
int proto = 0;
@@ -5417,7 +5417,7 @@
static PyObject *
cpm_dumps(PyObject *self, PyObject *args, PyObject *kwds)
{
- static const char *kwlist[] = {"obj", "protocol", NULL};
+ static char *kwlist[] = {"obj", "protocol", NULL};
PyObject *ob, *file = 0, *res = NULL;
Picklerobject *pickler = 0;
int proto = 0;
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
index 084852f..0811430 100644
--- a/Modules/nismodule.c
+++ b/Modules/nismodule.c
@@ -160,7 +160,7 @@
int err;
PyObject *res;
int fix;
- static const char *kwlist[] = {"key", "map", "domain", NULL};
+ static char *kwlist[] = {"key", "map", "domain", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwdict,
"t#s|s:match", kwlist,
@@ -192,7 +192,7 @@
struct ypcallback_data data;
PyObject *dict;
int err;
- static const char *kwlist[] = {"map", "domain", NULL};
+ static char *kwlist[] = {"map", "domain", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "s|s:cat",
kwlist, &map, &domain))
@@ -383,7 +383,7 @@
nismaplist *maps;
PyObject *list;
int err;
- static const char *kwlist[] = {"domain", NULL};
+ static char *kwlist[] = {"domain", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwdict,
"|s:maps", kwlist, &domain))
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 76b7cf9..b3001ea 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1726,7 +1726,7 @@
PyObject *intern = NULL;
PyObject *result;
int intern_decref = 0;
- static const char *kwlist[] = {"encoding", "namespace_separator",
+ static char *kwlist[] = {"encoding", "namespace_separator",
"intern", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kw, "|zzO:ParserCreate", kwlist,
diff --git a/Modules/sha256module.c b/Modules/sha256module.c
index e16338d..7037ca0 100644
--- a/Modules/sha256module.c
+++ b/Modules/sha256module.c
@@ -624,7 +624,7 @@
static PyObject *
SHA256_new(PyObject *self, PyObject *args, PyObject *kwdict)
{
- static const char *kwlist[] = {"string", NULL};
+ static char *kwlist[] = {"string", NULL};
SHAobject *new;
unsigned char *cp = NULL;
int len;
@@ -655,7 +655,7 @@
static PyObject *
SHA224_new(PyObject *self, PyObject *args, PyObject *kwdict)
{
- static const char *kwlist[] = {"string", NULL};
+ static char *kwlist[] = {"string", NULL};
SHAobject *new;
unsigned char *cp = NULL;
int len;
diff --git a/Modules/sha512module.c b/Modules/sha512module.c
index 3837795..539204e 100644
--- a/Modules/sha512module.c
+++ b/Modules/sha512module.c
@@ -690,7 +690,7 @@
static PyObject *
SHA512_new(PyObject *self, PyObject *args, PyObject *kwdict)
{
- static const char *kwlist[] = {"string", NULL};
+ static char *kwlist[] = {"string", NULL};
SHAobject *new;
unsigned char *cp = NULL;
int len;
@@ -721,7 +721,7 @@
static PyObject *
SHA384_new(PyObject *self, PyObject *args, PyObject *kwdict)
{
- static const char *kwlist[] = {"string", NULL};
+ static char *kwlist[] = {"string", NULL};
SHAobject *new;
unsigned char *cp = NULL;
int len;
diff --git a/Modules/shamodule.c b/Modules/shamodule.c
index 93a9224..058391d 100644
--- a/Modules/shamodule.c
+++ b/Modules/shamodule.c
@@ -543,7 +543,7 @@
static PyObject *
SHA_new(PyObject *self, PyObject *args, PyObject *kwdict)
{
- static const char *kwlist[] = {"string", NULL};
+ static char *kwlist[] = {"string", NULL};
SHAobject *new;
unsigned char *cp = NULL;
int len;