summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-05-24 20:52:56 +0200
committerAdrian Tschira <nota@notafile.com>2018-05-24 20:55:08 +0200
commitdd068ca9792e7f4a51690b91262131b5dae80455 (patch)
tree3a979667f0fc25653d3eb428bec23f4832085a4e /synapse/storage
parentMerge pull request #3278 from NotAFile/py3-storage-base (diff)
downloadsynapse-dd068ca9792e7f4a51690b91262131b5dae80455.tar.xz
remaining isintance fixes
Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/search.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py
index 6ba3e59889..a9c299a861 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