summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-11-01 10:39:14 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-11-01 10:39:14 +0000
commit57cdb046e48c6837fc9b41ade9b06d3ff68ec91b (patch)
tree48772d2922bd723314d066a94b8c2866b3baef10
parentIncorporate review (diff)
downloadsynapse-57cdb046e48c6837fc9b41ade9b06d3ff68ec91b.tar.xz
Lint
-rw-r--r--synapse/api/constants.py1
-rw-r--r--synapse/storage/data_stores/main/events.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index cf4ce5f5a2..066ce18704 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -142,5 +142,6 @@ class LimitBlockingTypes(object): class EventContentFields(object): """Fields found in events' content, regardless of type.""" + # Labels for the event, cf https://github.com/matrix-org/matrix-doc/pull/2326 Labels = "org.matrix.labels" diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py
index 42ffa9066a..0480161056 100644 --- a/synapse/storage/data_stores/main/events.py +++ b/synapse/storage/data_stores/main/events.py
@@ -29,7 +29,7 @@ from prometheus_client import Counter, Histogram from twisted.internet import defer import synapse.metrics -from synapse.api.constants import EventTypes, EventContentFields +from synapse.api.constants import EventContentFields, EventTypes from synapse.api.errors import SynapseError from synapse.events import EventBase # noqa: F401 from synapse.events.snapshot import EventContext # noqa: F401