diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
| commit | f009df23ec711e943d958bb0a0e3185d42d7cc79 (patch) | |
| tree | 30fa4558fe72f9429b0d533d12653dc786ad9692 /synapse/events | |
| parent | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-f009df23ec711e943d958bb0a0e3185d42d7cc79.tar.xz | |
Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/builder.py | 2 | ||||
| -rw-r--r-- | synapse/events/spamcheck.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/events/builder.py b/synapse/events/builder.py index 365fd96bd2..13fbba68c0 100644 --- a/synapse/events/builder.py +++ b/synapse/events/builder.py @@ -55,7 +55,7 @@ class EventBuilderFactory(object): local_part = str(int(self.clock.time())) + i + random_string(5) - e_id = EventID.create(local_part, self.hostname) + e_id = EventID(local_part, self.hostname) return e_id.to_string() diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py index dccc579eac..633e068eb8 100644 --- a/synapse/events/spamcheck.py +++ b/synapse/events/spamcheck.py @@ -22,7 +22,7 @@ class SpamChecker(object): config = None try: module, config = hs.config.spam_checker - except: + except Exception: pass if module is not None: |