diff options
| author | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2020-06-16 13:51:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 08:51:47 -0400 |
| commit | a3f11567d930b7da0db068c3b313f6f4abbf12a1 (patch) | |
| tree | ee9f7b2e8a8e088b4f745f07d79867ad2b163211 /synapse/util/frozenutils.py | |
| parent | Convert the device message and pagination handlers to async/await. (#7678) (diff) | |
| download | synapse-a3f11567d930b7da0db068c3b313f6f4abbf12a1.tar.xz | |
Replace all remaining six usage with native Python 3 equivalents (#7704)
Diffstat (limited to 'synapse/util/frozenutils.py')
| -rw-r--r-- | synapse/util/frozenutils.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py index 9815bb8667..eab78dd256 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from six import binary_type, text_type - from canonicaljson import json from frozendict import frozendict @@ -26,7 +24,7 @@ def freeze(o): if isinstance(o, frozendict): return o - if isinstance(o, (binary_type, text_type)): + if isinstance(o, (bytes, str)): return o try: @@ -41,7 +39,7 @@ def unfreeze(o): if isinstance(o, (dict, frozendict)): return dict({k: unfreeze(v) for k, v in o.items()}) - if isinstance(o, (binary_type, text_type)): + if isinstance(o, (bytes, str)): return o try: |