Commit3b3bc21

committed

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

1 parent9d5e39c commit3b3bc21Copy full SHA for 3b3bc21

File tree

+17

-10

lines changed

+17

-10

lines changed

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__importabsolute_import,division,unicode_literals`
`2`	`2`
`3`		`-fromsiximporttext_type,get_method_self`
`4`		`-fromsix.movesimporthttp_client`
	`3`	`+fromsiximporttext_type`
	`4`	`+fromsix.movesimporthttp_client,urllib`
`5`	`5`
`6`	`6`	`importcodecs`
`7`	`7`	`importre`
`@@ -131,13 +131,15 @@ def _readFromBuffer(self, bytes):`
`131`	`131`
`132`	`132`
`133`	`133`	`defHTMLInputStream(source,encoding=None,parseMeta=True,chardet=True):`
`134`		`-ifhasattr(source,"read"):`
`135`		`-ifisinstance(get_method_self(source.read),http_client.HTTPResponse):`
`136`		`-# Work around Python bug #20007: read(0) closes the connection.`
`137`		`-# http://bugs.python.org/issue20007`
`138`		`-isUnicode=False`
`139`		`-else:`
`140`		`-isUnicode=isinstance(source.read(0),text_type)`
	`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))):`
	`140`	`+isUnicode=False`
	`141`	`+elifhasattr(source,"read"):`
	`142`	`+isUnicode=isinstance(source.read(0),text_type)`
`141`	`143`	`else:`
`142`	`144`	`isUnicode=isinstance(source,text_type)`
`143`	`145`

Lines changed: 6 additions & 1 deletion

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

Comments

(0)