summaryrefslogtreecommitdiff
path: root/Modules/unicodedata.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 +0000
committerMartin Panter <vadmium+py@gmail.com>2017-01-29 10:16:28 +0000
commit23352add84278fc0476b2d6599489fbb70c9f5bc (patch)
tree600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Modules/unicodedata.c
parent6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff)
parent0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff)
downloadcpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Modules/unicodedata.c')
-rw-r--r--Modules/unicodedata.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 9e71e018e2..fbe811e807 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -808,7 +808,7 @@ unicodedata.UCD.normalize
self: self
form: str
- unistr as input: object(subclass_of='&PyUnicode_Type')
+ unistr as input: unicode
/
Return the normal form 'form' for the Unicode string unistr.
@@ -819,11 +819,8 @@ Valid values for form are 'NFC', 'NFKC', 'NFD', and 'NFKD'.
static PyObject *
unicodedata_UCD_normalize_impl(PyObject *self, const char *form,
PyObject *input)
-/*[clinic end generated code: output=62d1f8870027efdc input=cd092e631cf11883]*/
+/*[clinic end generated code: output=62d1f8870027efdc input=1744c55f4ab79bf0]*/
{
- if (PyUnicode_READY(input) == -1)
- return NULL;
-
if (PyUnicode_GET_LENGTH(input) == 0) {
/* Special case empty input strings, since resizing
them later would cause internal errors. */