diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 00:59:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 00:59:04 +0100 |
| commit | 049b0b5af223699df3571fa47ed4e48b968bb342 (patch) | |
| tree | dc47c250ce38d03173d981397bc85f74ce1951c0 /synapse | |
| parent | Merge pull request #3145 from NotAFile/py3-tests (diff) | |
| parent | replace stringIO imports (diff) | |
| download | synapse-049b0b5af223699df3571fa47ed4e48b968bb342.tar.xz | |
Merge pull request #3154 from NotAFile/py3-stringio
Replace stringIO imports with six
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/client.py | 4 | ||||
| -rw-r--r-- | synapse/util/logformatter.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 62309c3365..70a19d9b74 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -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) diff --git a/synapse/util/logformatter.py b/synapse/util/logformatter.py index cdbc4bffd7..59ab3c6968 100644 --- a/synapse/util/logformatter.py +++ b/synapse/util/logformatter.py @@ -14,7 +14,7 @@ # limitations under the License. -import StringIO +from six import StringIO import logging import traceback |