Dec 27, 2013
diff --git a/html5lib/inputstream.py b/html5lib/inputstream.py
 from __future__ import absolute_import, division, unicode_literals
 from six import text_type
 from six.moves import http_client
 from six.moves.urllib.response import addinfourl

 import codecs
 import re


 def HTMLInputStream(source, encoding=None, parseMeta=True, chardet=True):
    if isinstance(source, http_client.HTTPResponse):
        # Work around Python bug #20007: read(0) closes the connection.
        # http://bugs.python.org/issue20007
        isUnicode = False
    elif hasattr(source, "read"):
        isUnicode = isinstance(source.read(0), text_type)
    if hasattr(source, "read"):
        if isinstance(source, addinfourl):
            checked_source = source.fp
        else:
            checked_source = source
        if isinstance(checked_source, http_client.HTTPResponse):
            # Work around Python bug #20007: read(0) closes the connection.
            # http://bugs.python.org/issue20007
            isUnicode = False
        else:
            isUnicode = isinstance(source.read(0), text_type)
    else:
        isUnicode = isinstance(source, text_type)

diff --git a/html5lib/tests/test_stream.py b/html5lib/tests/test_stream.py
 from io import BytesIO

 from six.moves import http_client
 from six.moves.urllib.response import addinfourl

 from html5lib.inputstream import (BufferedStream, HTMLInputStream,
                                  HTMLUnicodeInputStream, HTMLBinaryInputStream)
        stream = HTMLInputStream(source)
        self.assertEqual(stream.charsUntil(" "), "Text")

        source = http_client.HTTPResponse(FakeSocket())
        source.begin()
        try:
            source = addinfourl(source, None, None)
        except AttributeError:
            # Fails on Python 2.x.
            # Apparently, addinfourl it only used with HTTPResponse on 3.x
            pass
        else:
            stream = HTMLInputStream(source)
            self.assertEqual(stream.charsUntil(" "), "Text")

 def buildTestSuite():
    return unittest.defaultTestLoader.loadTestsFromName(__name__)
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,7 @@
		from __future__ import absolute_import, division, unicode_literals
		from six import text_type
		from six.moves import http_client
		from six.moves.urllib.response import addinfourl

		import codecs
		import re
Expand DownExpand Up		@@ -119,12 +120,17 @@ def _readFromBuffer(self, bytes):


		def HTMLInputStream(source, encoding=None, parseMeta=True, chardet=True):
		if isinstance(source, http_client.HTTPResponse):
		# Work around Python bug #20007: read(0) closes the connection.
		# http://bugs.python.org/issue20007
		isUnicode = False
		elif hasattr(source, "read"):
		isUnicode = isinstance(source.read(0), text_type)
		if hasattr(source, "read"):
		if isinstance(source, addinfourl):
		checked_source = source.fp
		else:
		checked_source = source
		if isinstance(checked_source, http_client.HTTPResponse):
		# Work around Python bug #20007: read(0) closes the connection.
		# http://bugs.python.org/issue20007
		isUnicode = False
		else:
		isUnicode = isinstance(source.read(0), text_type)
		else:
		isUnicode = isinstance(source, text_type)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@
		from io import BytesIO

		from six.moves import http_client
		from six.moves.urllib.response import addinfourl

		from html5lib.inputstream import (BufferedStream, HTMLInputStream,
		HTMLUnicodeInputStream, HTMLBinaryInputStream)
Expand DownExpand Up		@@ -170,6 +171,17 @@ def makefile(self, _mode, _bufsize=None):
		stream = HTMLInputStream(source)
		self.assertEqual(stream.charsUntil(" "), "Text")

		source = http_client.HTTPResponse(FakeSocket())
		source.begin()
		try:
		source = addinfourl(source, None, None)
		except AttributeError:
		# Fails on Python 2.x.
		# Apparently, addinfourl it only used with HTTPResponse on 3.x
		pass
		else:
		stream = HTMLInputStream(source)
		self.assertEqual(stream.charsUntil(" "), "Text")

		def buildTestSuite():
		return unittest.defaultTestLoader.loadTestsFromName(__name__)
Expand Down