1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove some duplication

Browse Source
This commit is contained in:
Benjamin Peterson 2011-10-15 09:25:28 -04:00
parent ab7e2a4454
commit 7a6debe79c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Objects/unicodeobject.c
View File

@ -2838,6 +2838,10 @@ normalize_encoding(const char *encoding,
char *l; char *l;
char *l_end; char *l_end;
if (encoding == NULL) {
strcpy(lower, "utf-8");
return 1;
}
e = encoding; e = encoding;
l = lower; l = lower;
l_end = &lower[lower_len - 1]; l_end = &lower[lower_len - 1];
@ -2869,9 +2873,6 @@ PyUnicode_Decode(const char *s,
Py_buffer info; Py_buffer info;
char lower[11]; /* Enough for any encoding shortcut */ char lower[11]; /* Enough for any encoding shortcut */
if (encoding == NULL)
return PyUnicode_DecodeUTF8(s, size, errors);
/* Shortcuts for common default encodings */ /* Shortcuts for common default encodings */
if (normalize_encoding(encoding, lower, sizeof(lower))) { if (normalize_encoding(encoding, lower, sizeof(lower))) {
if ((strcmp(lower, "utf-8") == 0) || if ((strcmp(lower, "utf-8") == 0) ||
@ -3101,13 +3102,6 @@ PyUnicode_AsEncodedString(PyObject *unicode,
return NULL; return NULL;
} }
if (encoding == NULL) {
if (errors == NULL || strcmp(errors, "strict") == 0)
return _PyUnicode_AsUTF8String(unicode, NULL);
else
return _PyUnicode_AsUTF8String(unicode, errors);
}
/* Shortcuts for common default encodings */ /* Shortcuts for common default encodings */
if (normalize_encoding(encoding, lower, sizeof(lower))) { if (normalize_encoding(encoding, lower, sizeof(lower))) {
if ((strcmp(lower, "utf-8") == 0) || if ((strcmp(lower, "utf-8") == 0) ||