From 81e2d6b60a3a767eedb2f7882ffea8bdfb01f73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20D=C3=B6rwald?= Date: Thu, 1 Sep 2005 12:03:14 +0000 Subject: Backport checkin: SF bug #1235646: codecs.StreamRecoder.next() now reencodes the data it reads from the input stream, so that the output is a byte string in the correct encoding instead of a unicode string. --- Lib/codecs.py | 4 +++- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/codecs.py b/Lib/codecs.py index 761cc06..01adaef 100644 --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -556,7 +556,9 @@ class StreamRecoder: def next(self): """ Return the next decoded line from the input stream.""" - return self.reader.next() + data = self.reader.next() + data, bytesencoded = self.encode(data, self.errors) + return data def __iter__(self): return self diff --git a/Misc/NEWS b/Misc/NEWS index b265e33..9a890d5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -141,6 +141,9 @@ Library about illegal code points. The codec now supports PEP 293 style error handlers. +- Bug #1235646: ``codecs.StreamRecoder.next()`` now reencodes the data it reads + from the input stream, so that the output is a byte string in the correct + encoding instead of a unicode string. Build ----- -- cgit v0.12