Re-run 3to2, and fix where something had gone uncommitted in Python3 before.

gsnedders · gsnedders · commit 97b25e33bc7c · 2013-02-01T14:26:04.000Z
diff --git a/html5lib/inputstream.py b/html5lib/inputstream.py
@@ -123,6 +123,9 @@ def HTMLInputStream(source, encoding=None, parseMeta=True, chardet=True):
         isUnicode = isinstance(source, str)
 
     if isUnicode:
+        if encoding is not None:
+            raise TypeError("Cannot explicitly set an encoding with a unicode string")
+
         return HTMLUnicodeInputStream(source)
     else:
         return HTMLBinaryInputStream(source, encoding, parseMeta, chardet)
