diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2012-02-14 01:33:38 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2012-02-14 01:33:38 (GMT) |
commit | a9c895d4974808a511b9fb25dd91ddd3c2f1c7bf (patch) | |
tree | cc1c5cd9080c8d5a4ad9482f21358de00724650b /Modules/_localemodule.c | |
parent | dba5317eb0904916ace6fc09d0f8520dbb078863 (diff) | |
download | cpython-a9c895d4974808a511b9fb25dd91ddd3c2f1c7bf.zip cpython-a9c895d4974808a511b9fb25dd91ddd3c2f1c7bf.tar.gz cpython-a9c895d4974808a511b9fb25dd91ddd3c2f1c7bf.tar.bz2 |
PyUnicode_DecodeLocale() second argument is now a char*, no more an int
Diffstat (limited to 'Modules/_localemodule.c')
-rw-r--r-- | Modules/_localemodule.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 1cab7c0..20c59a4 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -112,7 +112,7 @@ PyLocale_setlocale(PyObject* self, PyObject* args) PyErr_SetString(Error, "unsupported locale setting"); return NULL; } - result_object = PyUnicode_DecodeLocale(result, 0); + result_object = PyUnicode_DecodeLocale(result, NULL); if (!result_object) return NULL; } else { @@ -122,7 +122,7 @@ PyLocale_setlocale(PyObject* self, PyObject* args) PyErr_SetString(Error, "locale query failed"); return NULL; } - result_object = PyUnicode_DecodeLocale(result, 0); + result_object = PyUnicode_DecodeLocale(result, NULL); } return result_object; } @@ -148,7 +148,7 @@ PyLocale_localeconv(PyObject* self) involved herein */ #define RESULT_STRING(s)\ - x = PyUnicode_DecodeLocale(l->s, 0); \ + x = PyUnicode_DecodeLocale(l->s, NULL); \ if (!x) goto failed;\ PyDict_SetItemString(result, #s, x);\ Py_XDECREF(x) @@ -439,7 +439,7 @@ PyLocale_nl_langinfo(PyObject* self, PyObject* args) instead of an empty string for nl_langinfo(ERA). */ const char *result = nl_langinfo(item); result = result != NULL ? result : ""; - return PyUnicode_DecodeLocale(result, 0); + return PyUnicode_DecodeLocale(result, NULL); } PyErr_SetString(PyExc_ValueError, "unsupported langinfo constant"); return NULL; @@ -458,7 +458,7 @@ PyIntl_gettext(PyObject* self, PyObject *args) char *in; if (!PyArg_ParseTuple(args, "s", &in)) return 0; - return PyUnicode_DecodeLocale(gettext(in), 0); + return PyUnicode_DecodeLocale(gettext(in), NULL); } PyDoc_STRVAR(dgettext__doc__, @@ -471,7 +471,7 @@ PyIntl_dgettext(PyObject* self, PyObject *args) char *domain, *in; if (!PyArg_ParseTuple(args, "zs", &domain, &in)) return 0; - return PyUnicode_DecodeLocale(dgettext(domain, in), 0); + return PyUnicode_DecodeLocale(dgettext(domain, in), NULL); } PyDoc_STRVAR(dcgettext__doc__, @@ -485,7 +485,7 @@ PyIntl_dcgettext(PyObject *self, PyObject *args) int category; if (!PyArg_ParseTuple(args, "zsi", &domain, &msgid, &category)) return 0; - return PyUnicode_DecodeLocale(dcgettext(domain,msgid,category), 0); + return PyUnicode_DecodeLocale(dcgettext(domain,msgid,category), NULL); } PyDoc_STRVAR(textdomain__doc__, @@ -503,7 +503,7 @@ PyIntl_textdomain(PyObject* self, PyObject* args) PyErr_SetFromErrno(PyExc_OSError); return NULL; } - return PyUnicode_DecodeLocale(domain, 0); + return PyUnicode_DecodeLocale(domain, NULL); } PyDoc_STRVAR(bindtextdomain__doc__, @@ -535,7 +535,7 @@ PyIntl_bindtextdomain(PyObject* self,PyObject*args) PyErr_SetFromErrno(PyExc_OSError); return NULL; } - result = PyUnicode_DecodeLocale(current_dirname, 0); + result = PyUnicode_DecodeLocale(current_dirname, NULL); Py_XDECREF(dirname_bytes); return result; } @@ -553,7 +553,7 @@ PyIntl_bind_textdomain_codeset(PyObject* self,PyObject*args) return NULL; codeset = bind_textdomain_codeset(domain, codeset); if (codeset) - return PyUnicode_DecodeLocale(codeset, 0); + return PyUnicode_DecodeLocale(codeset, NULL); Py_RETURN_NONE; } #endif |