diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-24 13:04:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-24 13:04:07 -0500 |
commit | 1f6969334727787286502e8387d6803aec342f24 (patch) | |
tree | d26996245c3e27e3667f025a891b751fcdeaac54 /synapse/storage/event_push_actions.py | |
parent | Merge pull request #3246 from NotAFile/py3-repr-string (diff) | |
parent | replace some iteritems with six (diff) | |
download | synapse-1f6969334727787286502e8387d6803aec342f24.tar.xz |
Merge pull request #3244 from NotAFile/py3-six-4
replace some iteritems with six
Diffstat (limited to 'synapse/storage/event_push_actions.py')
-rw-r--r-- | synapse/storage/event_push_actions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py index f084a5f54b..d0350ee5fe 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py @@ -22,6 +22,8 @@ from synapse.util.caches.descriptors import cachedInlineCallbacks import logging import simplejson as json +from six import iteritems + logger = logging.getLogger(__name__) @@ -420,7 +422,7 @@ class EventPushActionsWorkerStore(SQLBaseStore): txn.executemany(sql, ( _gen_entry(user_id, actions) - for user_id, actions in user_id_actions.iteritems() + for user_id, actions in iteritems(user_id_actions) )) return self.runInteraction( |