#1065986: add missing error handler in pydoc unicode fix.

bitdancer · bitdancer · commit 875565bbd602 · 2014-01-05T17:14:08.000-05:00
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
@@ -209,7 +209,9 @@ def _encode(text, encoding=None):
 def _binstr(obj):
     # Ensure that we have an encoded (binary) string representation of obj,
     # even if it is a unicode string.
-    return obj.encode(_encoding) if isinstance(obj, _unicode) else str(obj)
+    if isinstance(obj, _unicode):
+        return obj.encode(_encoding, 'xmlcharrefreplace')
+    return str(obj)
 
 # ----------------------------------------------------- module manipulation
 
