summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-11 11:20:01 +0100
committerGitHub <noreply@github.com>2018-04-11 11:20:01 +0100
commit233699c42e1cc6c0b3f3fa28bf62f80204f701ee (patch)
treeece93e263e91f64f1bb24725b69734b4bf32274b /synapse/storage/_base.py
parentMerge pull request #3086 from matrix-org/r30_stats (diff)
parentDon't disable GC when running on PyPy (diff)
downloadsynapse-233699c42e1cc6c0b3f3fa28bf62f80204f701ee.tar.xz
Merge pull request #2760 from Valodim/pypy
Synapse on PyPy
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 2fbebd4907..2262776ab2 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -376,7 +376,7 @@ class SQLBaseStore(object):
         Returns:
             A list of dicts where the key is the column header.
         """
-        col_headers = list(intern(column[0]) for column in cursor.description)
+        col_headers = list(intern(str(column[0])) for column in cursor.description)
         results = list(
             dict(zip(col_headers, row)) for row in cursor
         )