diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-30 12:44:46 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 12:44:46 +1000 |
| commit | debff7ae092231652d5bb937845f316bcc72f845 (patch) | |
| tree | 51e39c6acde568437807ee40c32b6f211b13e365 /synapse/storage | |
| parent | Update some comments and docstrings in SyncHandler (diff) | |
| parent | pep8 (diff) | |
| download | synapse-debff7ae092231652d5bb937845f316bcc72f845.tar.xz | |
Merge pull request #3281 from NotAFile/py3-six-isinstance
remaining isintance fixes
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/search.py | 5 |
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 |