mirror of
https://github.com/element-hq/synapse
synced 2024-08-18 20:20:52 +00:00
Merge pull request #3154 from NotAFile/py3-stringio
Replace stringIO imports with six
This commit is contained in:
commit
049b0b5af2
2 changed files with 3 additions and 3 deletions
|
@ -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)
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
import StringIO
|
||||
from six import StringIO
|
||||
import logging
|
||||
import traceback
|
||||
|
||||
|
|
Loading…
Reference in a new issue