diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
| commit | fb233dc40b3111e905e394e627b8ecc3b2a91e80 (patch) | |
| tree | 931ab474f042b5eb5df9663306a4936406dcf17c /synapse/events/__init__.py | |
| parent | PEP8 (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-fb233dc40b3111e905e394e627b8ecc3b2a91e80.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
Diffstat (limited to 'synapse/events/__init__.py')
| -rw-r--r-- | synapse/events/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 4252e5ab5c..8f0c6e959f 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -18,7 +18,7 @@ from synapse.util.frozenutils import freeze, unfreeze class _EventInternalMetadata(object): def __init__(self, internal_metadata_dict): - self.__dict__ = internal_metadata_dict + self.__dict__ = dict(internal_metadata_dict) def get_dict(self): return dict(self.__dict__) @@ -77,7 +77,7 @@ class EventBase(object): return self.content["membership"] def is_state(self): - return hasattr(self, "state_key") + return hasattr(self, "state_key") and self.state_key is not None def get_dict(self): d = dict(self._event_dict) |