Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 23:13:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3281 from NotAFile/py3-six-isinstance

Browse source 
remaining isintance fixes
This commit is contained in:
Amber Brown 2018-05-30 12:44:46 +10:00 • committed by GitHub
commit debff7ae09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/storage/search.py
View file

@ -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