From dd068ca9792e7f4a51690b91262131b5dae80455 Mon Sep 17 00:00:00 2001
From: Adrian Tschira <nota@notafile.com>
Date: Thu, 24 May 2018 20:52:56 +0200
Subject: [PATCH] remaining isintance fixes

Signed-off-by: Adrian Tschira <nota@notafile.com>
---
 synapse/storage/search.py          |  5 +++--
 synapse/util/caches/descriptors.py | 12 ++++++++----
 synapse/util/frozenutils.py        |  5 +++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/synapse/storage/search.py b/synapse/storage/search.py
index 6ba3e5988..a9c299a86 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -18,13 +18,14 @@ import logging
 import re
 import simplejson as json
 
+from six import string_types
+
 from twisted.internet import defer
 
 from .background_updates import BackgroundUpdateStore
 from synapse.api.errors import SynapseError
 from synapse.storage.engines import PostgresEngine, Sqlite3Engine
 
-
 logger = logging.getLogger(__name__)
 
 SearchEntry = namedtuple('SearchEntry', [
@@ -126,7 +127,7 @@ class SearchStore(BackgroundUpdateStore):
                     # skip over it.
                     continue
 
-                if not isinstance(value, basestring):
+                if not isinstance(value, string_types):
                     # If the event body, name or topic isn't a string
                     # then skip over it
                     continue
diff --git a/synapse/util/caches/descriptors.py b/synapse/util/caches/descriptors.py
index 68285a759..b595cd616 100644
--- a/synapse/util/caches/descriptors.py
+++ b/synapse/util/caches/descriptors.py
@@ -31,6 +31,9 @@ import functools
 import inspect
 import threading
 
+from six import string_types, itervalues
+import six
+
 
 logger = logging.getLogger(__name__)
 
@@ -205,7 +208,7 @@ class Cache(object):
     def invalidate_all(self):
         self.check_thread()
         self.cache.clear()
-        for entry in self._pending_deferred_cache.itervalues():
+        for entry in itervalues(self._pending_deferred_cache):
             entry.invalidate()
         self._pending_deferred_cache.clear()
 
@@ -392,9 +395,10 @@ class CacheDescriptor(_CacheDescriptorBase):
 
                 ret.addErrback(onErr)
 
-                # If our cache_key is a string, try to convert to ascii to save
-                # a bit of space in large caches
-                if isinstance(cache_key, basestring):
+                # If our cache_key is a string on py2, try to convert to ascii
+                # to save a bit of space in large caches. Py3 does this
+                # internally automatically.
+                if six.PY2 and isinstance(cache_key, string_types):
                     cache_key = to_ascii(cache_key)
 
                 result_d = ObservableDeferred(ret, consumeErrors=True)
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py
index f497b51f4..4cd0566f4 100644
--- a/synapse/util/frozenutils.py
+++ b/synapse/util/frozenutils.py
@@ -16,6 +16,7 @@
 from frozendict import frozendict
 import simplejson as json
 
+from six import string_types
 
 def freeze(o):
     t = type(o)
@@ -25,7 +26,7 @@ def freeze(o):
     if t is frozendict:
         return o
 
-    if t is str or t is unicode:
+    if isinstance(t, string_types):
         return o
 
     try:
@@ -41,7 +42,7 @@ def unfreeze(o):
     if t is dict or t is frozendict:
         return dict({k: unfreeze(v) for k, v in o.items()})
 
-    if t is str or t is unicode:
+    if isinstance(t, string_types):
         return o
 
     try: