cpython: b37db216c8e0 (original) (raw)

Mercurial > cpython

changeset 104517:b37db216c8e0

merge 3.6 (#28454) [#28454]

Benjamin Peterson benjamin@python.org
date	Sun, 16 Oct 2016 15:42:33 -0700
parents	767a78aacd29(current diff)738579b25d02(diff)
children	a293e5db9083
files	Objects/unicodeobject.c
diffstat	1 files changed, 4 insertions(+), 4 deletions(-)[+] [-] Objects/unicodeobject.c 8

line wrap: on

line diff

--- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3215,7 +3215,7 @@ PyUnicode_Decode(const char *s, "'%.400s' decoder returned '%.400s' instead of 'str'; " "use codecs.decode() to decode to arbitrary types", encoding,

                Py_TYPE(unicode)->tp_name, Py_TYPE(unicode)->tp_name);[](#l1.7)

```
                Py_TYPE(unicode)->tp_name);[](#l1.8)
   Py_DECREF(unicode);[](#l1.9)
   goto onError;[](#l1.10)
```
} @@ -3276,7 +3276,7 @@ PyUnicode_AsDecodedUnicode(PyObject *uni "'%.400s' decoder returned '%.400s' instead of 'str'; " "use codecs.decode() to decode to arbitrary types", encoding,

                Py_TYPE(unicode)->tp_name, Py_TYPE(unicode)->tp_name);[](#l1.16)

```
                Py_TYPE(unicode)->tp_name);[](#l1.17)
   Py_DECREF(v);[](#l1.18)
   goto onError;[](#l1.19)
```
} @@ -3622,7 +3622,7 @@ PyUnicode_AsEncodedString(PyObject *unic "'%.400s' encoder returned '%.400s' instead of 'bytes'; " "use codecs.encode() to encode to arbitrary types", encoding,

            Py_TYPE(v)->tp_name, Py_TYPE(v)->tp_name);[](#l1.25)

```
            Py_TYPE(v)->tp_name);[](#l1.26)
```
Py_DECREF(v); return NULL; } @@ -3651,7 +3651,7 @@ PyUnicode_AsEncodedUnicode(PyObject *uni "'%.400s' encoder returned '%.400s' instead of 'str'; " "use codecs.encode() to encode to arbitrary types", encoding,

                Py_TYPE(v)->tp_name, Py_TYPE(v)->tp_name);[](#l1.34)

                Py_TYPE(v)->tp_name);[](#l1.35)
   Py_DECREF(v);[](#l1.36)
   goto onError;[](#l1.37)

}