Commit498629d

committed

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

1 parente1e8d89 commit498629dCopy full SHA for 498629d

File tree

+25

-8

lines changed

+25

-8

lines changed

Lines changed: 9 additions & 7 deletions

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

Lines changed: 16 additions & 1 deletion

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

Comments

(0)