summaryrefslogtreecommitdiffstats
path: root/Modules/cjkcodecs
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-11-20 07:13:07 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-11-20 07:13:07 (GMT)
commit06515833fef7b8b5c7968edf72367d94ff7eb1e0 (patch)
tree58a7c06bba8141883a5e5c8621d2b0683ae9fe2e /Modules/cjkcodecs
parente20973926a2ec19c4b87e460dc6f0edb478ce352 (diff)
downloadcpython-06515833fef7b8b5c7968edf72367d94ff7eb1e0.zip
cpython-06515833fef7b8b5c7968edf72367d94ff7eb1e0.tar.gz
cpython-06515833fef7b8b5c7968edf72367d94ff7eb1e0.tar.bz2
Replaced outdated macros _PyUnicode_AsString and _PyUnicode_AsStringAndSize
with PyUnicode_AsUTF8 and PyUnicode_AsUTF8AndSize.
Diffstat (limited to 'Modules/cjkcodecs')
-rw-r--r--Modules/cjkcodecs/cjkcodecs.h2
-rw-r--r--Modules/cjkcodecs/multibytecodec.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
index b72a3f0..2ae28ec 100644
--- a/Modules/cjkcodecs/cjkcodecs.h
+++ b/Modules/cjkcodecs/cjkcodecs.h
@@ -267,7 +267,7 @@ getcodec(PyObject *self, PyObject *encoding)
"encoding name must be a string.");
return NULL;
}
- enc = _PyUnicode_AsString(encoding);
+ enc = PyUnicode_AsUTF8(encoding);
if (enc == NULL)
return NULL;
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index f5c8421..d1da189 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -85,7 +85,7 @@ call_error_callback(PyObject *errors, PyObject *exc)
const char *str;
assert(PyUnicode_Check(errors));
- str = _PyUnicode_AsString(errors);
+ str = PyUnicode_AsUTF8(errors);
if (str == NULL)
return NULL;
cb = PyCodec_LookupError(str);
@@ -138,7 +138,7 @@ codecctx_errors_set(MultibyteStatefulCodecContext *self, PyObject *value,
return -1;
}
- str = _PyUnicode_AsString(value);
+ str = PyUnicode_AsUTF8(value);
if (str == NULL)
return -1;