Commitbf7da77

committed

Add a more general fix for#127 (CPy #20007) based on#136.

1 parent082c042 commitbf7da77Copy full SHA for bf7da77

File tree

+29

-5

lines changed

+29

-5

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`from __future__importabsolute_import,division,unicode_literals`
	`2`	`+`
`2`	`3`	`fromsiximporttext_type`
`3`		`-fromsix.movesimporthttp_client`
	`4`	`+fromsix.movesimporthttp_client,urllib`
`4`	`5`
`5`	`6`	`importcodecs`
`6`	`7`	`importre`
`@@ -130,9 +131,12 @@ def _readFromBuffer(self, bytes):`
`130`	`131`
`131`	`132`
`132`	`133`	`defHTMLInputStream(source,encoding=None,parseMeta=True,chardet=True):`
`133`		`-ifisinstance(source,http_client.HTTPResponse):`
`134`		`-# Work around Python bug #20007: read(0) closes the connection.`
`135`		`-# http://bugs.python.org/issue20007`
	`134`	`+# Work around Python bug #20007: read(0) closes the connection.`
	`135`	`+# http://bugs.python.org/issue20007`
	`136`	`+if (isinstance(source,http_client.HTTPResponse)or`
	`137`	`+# Also check for addinfourl wrapping HTTPResponse`
	`138`	`+ (isinstance(source,urllib.response.addbase)and`
	`139`	`+isinstance(source.fp,http_client.HTTPResponse))):`
`136`	`140`	`isUnicode=False`
`137`	`141`	`elifhasattr(source,"read"):`
`138`	`142`	`isUnicode=isinstance(source.read(0),text_type)`

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,10 @@`
`4`	`4`	`importunittest`
`5`	`5`	`importcodecs`
`6`	`6`	`fromioimportBytesIO`
	`7`	`+importsocket`
`7`	`8`
`8`		`-fromsix.movesimporthttp_client`
	`9`	`+importsix`
	`10`	`+fromsix.movesimporthttp_client,urllib`
`9`	`11`
`10`	`12`	`fromhtml5lib.inputstreamimport (BufferedStream,HTMLInputStream,`
`11`	`13`	`HTMLUnicodeInputStream,HTMLBinaryInputStream)`
`@@ -170,6 +172,24 @@ def makefile(self, _mode, _bufsize=None):`
`170`	`172`	`stream=HTMLInputStream(source)`
`171`	`173`	`self.assertEqual(stream.charsUntil(" "),"Text")`
`172`	`174`
	`175`	`+deftest_python_issue_20007_b(self):`
	`176`	`+"""`
	`177`	`+ Make sure we have a work-around for Python bug #20007`
	`178`	`+ http://bugs.python.org/issue20007`
	`179`	`+ """`
	`180`	`+ifsix.PY2:`
	`181`	`+return`
	`182`	`+`
	`183`	`+classFakeSocket(object):`
	`184`	`+defmakefile(self,_mode,_bufsize=None):`
	`185`	`+returnBytesIO(b"HTTP/1.1 200 Ok\r\n\r\nText")`
	`186`	`+`
	`187`	`+source=http_client.HTTPResponse(FakeSocket())`
	`188`	`+source.begin()`
	`189`	`+wrapped=urllib.response.addinfourl(source,source.msg,"http://example.com")`
	`190`	`+stream=HTMLInputStream(wrapped)`
	`191`	`+self.assertEqual(stream.charsUntil(" "),"Text")`
	`192`	`+`
`173`	`193`
`174`	`194`	`defbuildTestSuite():`
`175`	`195`	`returnunittest.defaultTestLoader.loadTestsFromName(__name__)`

Comments

(0)