summary refs log tree commit diff
path: root/tests/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:15:34 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:15:34 -0700
commit48e7f210c6655b83a2f719acb7f41cf0fece10a1 (patch)
tree961b66bdd6b432bc8af4f8519e4fce81bd2f4863 /tests/server.py
parentMerge commit '98c4e35e3' into dinsic (diff)
parentReplace all remaining six usage with native Python 3 equivalents (#7704) (diff)
downloadsynapse-48e7f210c6655b83a2f719acb7f41cf0fece10a1.tar.xz
Merge commit 'a3f11567d' into dinsic
* commit 'a3f11567d':
  Replace all remaining six usage with native Python 3 equivalents (#7704)
Diffstat (limited to 'tests/server.py')
-rw-r--r--tests/server.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/server.py b/tests/server.py

index 1644710aa0..a5e57c52fa 100644 --- a/tests/server.py +++ b/tests/server.py
@@ -2,8 +2,6 @@ import json import logging from io import BytesIO -from six import text_type - import attr from zope.interface import implementer @@ -174,7 +172,7 @@ def make_request( if not path.startswith(b"/"): path = b"/" + path - if isinstance(content, text_type): + if isinstance(content, str): content = content.encode("utf8") site = FakeSite()