Ticket #5875: patch.diff

__init__.

@@ -329 +329 @@
     def next(self):
         chunk = self._iterator.next()
         if isinstance(chunk, unicode):
-            chunk = chunk.encode(self._charset)
+            try:
+                chunk = chunk.encode(self._charset)
+            except UnicodeEncodeError, e:
+                chunk = chunk.encode(self._charset, "replace")
         return chunk
 
     def close(self):