]>
Commit | Line | Data |
---|---|---|
8ac2eab1 AM |
1 | --- mysql-connector-python-8.0.11/src/mysql_capi_conversion.c~ 2018-04-10 14:35:30.000000000 +0200 |
2 | +++ mysql-connector-python-8.0.11/src/mysql_capi_conversion.c 2018-05-28 08:13:02.693638891 +0200 | |
3 | @@ -734,7 +734,7 @@ pytomy_decimal(PyObject *obj) | |
4 | @param use_unicode return Unicode | |
5 | ||
6 | @return Converted string | |
7 | - @retval PyUnicode if not BINARY_FLAG | |
8 | + @retval PyUnicode if not binary charset | |
9 | @retval PyBytes Python v3 if not use_unicode | |
10 | @retval PyString Python v2 if not use_unicode | |
11 | @retval NULL Exception | |
12 | @@ -756,7 +756,7 @@ mytopy_string(const char *data, const un | |
13 | return NULL; | |
14 | } | |
15 | ||
16 | - if (!(flags & BINARY_FLAG) && use_unicode && strcmp(charset, "binary") != 0) | |
17 | + if (use_unicode && strcmp(charset, "binary") != 0) | |
18 | { | |
19 | return PyUnicode_Decode(data, length, charset, NULL); | |
20 | } |