diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-04-15 02:27:11 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-15 02:27:11 (GMT) |
| commit | cda80940ed444d01beed797dcd86c207f11104bc (patch) | |
| tree | 7beaa1c4db9c2e8351a9cf8ddda6a656900d4275 /Python | |
| parent | 8ca020e1cc2590472ba83611727ae20d9f34bfe5 (diff) | |
| parent | 20d325574eaa4f2a88036eac81e8d3cf9135372f (diff) | |
| download | cpython-cda80940ed444d01beed797dcd86c207f11104bc.zip cpython-cda80940ed444d01beed797dcd86c207f11104bc.tar.gz cpython-cda80940ed444d01beed797dcd86c207f11104bc.tar.bz2 | |
Issue #15984: Merge PyUnicode doc from 3.5
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/codecs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index d90bf73..fe57d0d 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -403,7 +403,7 @@ wrap_codec_error(const char *operation, operation, encoding); } -/* Encode an object (e.g. an Unicode object) using the given encoding +/* Encode an object (e.g. a Unicode object) using the given encoding and return the resulting encoded object (usually a Python string). errors is passed to the encoder factory as argument if non-NULL. */ @@ -450,7 +450,7 @@ _PyCodec_EncodeInternal(PyObject *object, } /* Decode an object (usually a Python string) using the given encoding - and return an equivalent object (e.g. an Unicode object). + and return an equivalent object (e.g. a Unicode object). errors is passed to the decoder factory as argument if non-NULL. */ |