Commit 19e62387 authored by Walter Dörwald's avatar Walter Dörwald

Fix stupid typo in Lib/encodings/utf_32.py which led to failing tests

on big endian machines.

Update documentation: UTF-32 codecs will be in 2.6.
parent 8d991ed2
...@@ -1434,7 +1434,7 @@ These are the UTF-32 codec APIs: ...@@ -1434,7 +1434,7 @@ These are the UTF-32 codec APIs:
Return *NULL* if an exception was raised by the codec. Return *NULL* if an exception was raised by the codec.
.. versionadded:: 3.0 .. versionadded:: 2.6
.. cfunction:: PyObject* PyUnicode_DecodeUTF32Stateful(const char *s, Py_ssize_t size, const char *errors, int *byteorder, Py_ssize_t *consumed) .. cfunction:: PyObject* PyUnicode_DecodeUTF32Stateful(const char *s, Py_ssize_t size, const char *errors, int *byteorder, Py_ssize_t *consumed)
...@@ -1445,7 +1445,7 @@ These are the UTF-32 codec APIs: ...@@ -1445,7 +1445,7 @@ These are the UTF-32 codec APIs:
by four) as an error. Those bytes will not be decoded and the number of bytes by four) as an error. Those bytes will not be decoded and the number of bytes
that have been decoded will be stored in *consumed*. that have been decoded will be stored in *consumed*.
.. versionadded:: 3.0 .. versionadded:: 2.6
.. cfunction:: PyObject* PyUnicode_EncodeUTF32(const Py_UNICODE *s, Py_ssize_t size, const char *errors, int byteorder) .. cfunction:: PyObject* PyUnicode_EncodeUTF32(const Py_UNICODE *s, Py_ssize_t size, const char *errors, int byteorder)
...@@ -1466,6 +1466,8 @@ These are the UTF-32 codec APIs: ...@@ -1466,6 +1466,8 @@ These are the UTF-32 codec APIs:
Return *NULL* if an exception was raised by the codec. Return *NULL* if an exception was raised by the codec.
.. versionadded:: 2.6
.. cfunction:: PyObject* PyUnicode_AsUTF32String(PyObject *unicode) .. cfunction:: PyObject* PyUnicode_AsUTF32String(PyObject *unicode)
...@@ -1473,6 +1475,9 @@ These are the UTF-32 codec APIs: ...@@ -1473,6 +1475,9 @@ These are the UTF-32 codec APIs:
string always starts with a BOM mark. Error handling is "strict". Return string always starts with a BOM mark. Error handling is "strict". Return
*NULL* if an exception was raised by the codec. *NULL* if an exception was raised by the codec.
.. versionadded:: 2.6
These are the UTF-16 codec APIs: These are the UTF-16 codec APIs:
.. % --- UTF-16 Codecs ------------------------------------------------------ */ .. % --- UTF-16 Codecs ------------------------------------------------------ */
......
...@@ -125,7 +125,7 @@ class StreamReader(codecs.StreamReader): ...@@ -125,7 +125,7 @@ class StreamReader(codecs.StreamReader):
if byteorder == -1: if byteorder == -1:
self.decode = codecs.utf_32_le_decode self.decode = codecs.utf_32_le_decode
elif byteorder == 1: elif byteorder == 1:
self.decode = codecs.utf_32_le_decode self.decode = codecs.utf_32_be_decode
elif consumed>=4: elif consumed>=4:
raise UnicodeError,"UTF-32 stream does not start with BOM" raise UnicodeError,"UTF-32 stream does not start with BOM"
return (object, consumed) return (object, consumed)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment