Merge pull request #3154 from NotAFile/py3-stringio

Replace stringIO imports with six
pull/3149/merge
Richard van der Hoff 2018-04-30 00:59:04 +01:00 committed by GitHub
commit 049b0b5af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -40,7 +40,7 @@ from twisted.web.http import PotentialDataLoss
from twisted.web.http_headers import Headers
from twisted.web._newclient import ResponseDone
from StringIO import StringIO
from six import StringIO
import simplejson as json
import logging
@ -507,7 +507,7 @@ class SpiderHttpClient(SimpleHttpClient):
reactor,
SpiderEndpointFactory(hs)
)
), [('gzip', GzipDecoder)]
), [(b'gzip', GzipDecoder)]
)
# We could look like Chrome:
# self.user_agent = ("Mozilla/5.0 (%s) (KHTML, like Gecko)

View File

@ -14,7 +14,7 @@
# limitations under the License.
import StringIO
from six import StringIO
import logging
import traceback