diff options
| -rw-r--r-- | synapse/events/__init__.py | 4 | ||||
| -rw-r--r-- | synapse/push/push_rule_evaluator.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 79bbdfcf2c..26650cdeac 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -127,8 +127,8 @@ class EventBase(object): def __set__(self, instance, value): raise AttributeError("Unrecognized attribute %s" % (instance,)) - def items(self): - return self._event_dict.items() + def iteritems(self): + return self._event_dict.iteritems() class FrozenEvent(EventBase): diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py index ad24167d15..9f3673da90 100644 --- a/synapse/push/push_rule_evaluator.py +++ b/synapse/push/push_rule_evaluator.py @@ -237,10 +237,10 @@ def _re_word_boundary(r): def _flatten_dict(d, prefix=[], result=None): if result is None: result = {} - for key, value in d.items(): + for key, value in d.iteritems(): if isinstance(value, basestring): result[".".join(prefix + [key])] = value.lower() - elif hasattr(value, "items"): + elif hasattr(value, "iteritems"): _flatten_dict(value, prefix=(prefix + [key]), result=result) return result |