Commit18bc278

committed

Fix#127, add a work-around for CPython bug 20007.

The bug has been fixed upstream, but this works around iton older Python versions.This does not change any behavior on Python versions with the fix.

1 parente269a2f commit18bc278Copy full SHA for 18bc278

File tree

+22

-1

lines changed

+22

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`from __future__importabsolute_import,division,unicode_literals`
`2`	`2`	`fromsiximporttext_type`
	`3`	`+fromsix.movesimporthttp_client`
`3`	`4`
`4`	`5`	`importcodecs`
`5`	`6`	`importre`
`@@ -118,7 +119,11 @@ def _readFromBuffer(self, bytes):`
`118`	`119`
`119`	`120`
`120`	`121`	`defHTMLInputStream(source,encoding=None,parseMeta=True,chardet=True):`
`121`		`-ifhasattr(source,"read"):`
	`122`	`+ifisinstance(source,http_client.HTTPResponse):`
	`123`	`+# Work around Python bug #20007: read(0) closes the connection.`
	`124`	`+# http://bugs.python.org/issue20007`
	`125`	`+isUnicode=False`
	`126`	`+elifhasattr(source,"read"):`
`122`	`127`	`isUnicode=isinstance(source.read(0),text_type)`
`123`	`128`	`else:`
`124`	`129`	`isUnicode=isinstance(source,text_type)`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`importcodecs`
`6`	`6`	`fromioimportBytesIO`
`7`	`7`
	`8`	`+fromsix.movesimporthttp_client`
	`9`	`+`
`8`	`10`	`fromhtml5lib.inputstreamimport (BufferedStream,HTMLInputStream,`
`9`	`11`	`HTMLUnicodeInputStream,HTMLBinaryInputStream)`
`10`	`12`
`@@ -154,6 +156,20 @@ def test_position2(self):`
`154`	`156`	`self.assertEqual(stream.char(),"d")`
`155`	`157`	`self.assertEqual(stream.position(), (2,1))`
`156`	`158`
	`159`	`+deftest_python_issue_20007(self):`
	`160`	`+"""`
	`161`	`+ Make sure we have a work-around for Python bug #20007`
	`162`	`+ http://bugs.python.org/issue20007`
	`163`	`+ """`
	`164`	`+classFakeSocket(object):`
	`165`	`+defmakefile(self,_mode,_bufsize=None):`
	`166`	`+returnBytesIO(b"HTTP/1.1 200 Ok\r\n\r\nText")`
	`167`	`+`
	`168`	`+source=http_client.HTTPResponse(FakeSocket())`
	`169`	`+source.begin()`
	`170`	`+stream=HTMLInputStream(source)`
	`171`	`+self.assertEqual(stream.charsUntil(" "),"Text")`
	`172`	`+`
`157`	`173`
`158`	`174`	`defbuildTestSuite():`
`159`	`175`	`returnunittest.defaultTestLoader.loadTestsFromName(__name__)`

Comments

(0)