From 75eba3b07d58743f24068efef67d5755f58207ba Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Fri, 23 Jun 2017 15:15:18 +0200 Subject: [PATCH] Fix TravisCI tests for PR #2301 --- synapse/config/pushconfig.py => push.py | 3 --- synapse/config/homeserver.py | 2 +- synapse/push/httppusher.py | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) rename synapse/config/pushconfig.py => push.py (94%) diff --git a/synapse/config/pushconfig.py b/push.py similarity index 94% rename from synapse/config/pushconfig.py rename to push.py index afe8aba0a..4e5f42882 100644 --- a/synapse/config/pushconfig.py +++ b/push.py @@ -13,9 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file can't be called email.py because if it is, we cannot: -import email.utils - from ._base import Config diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 327c7e4fc..b22cacf8d 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -33,7 +33,7 @@ from .jwt import JWTConfig from .password_auth_providers import PasswordAuthProviderConfig from .emailconfig import EmailConfig from .workers import WorkerConfig -from .pushconfig import PushConfig +from .push import PushConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index f3f872895..8a5d47310 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -275,7 +275,7 @@ class HttpPusher(object): if event.type == 'm.room.member': d['notification']['membership'] = event.content['membership'] d['notification']['user_is_target'] = event.state_key == self.user_id - if not hs.config.push_redact_content and 'content' in event: + if not self.hs.config.push_redact_content and 'content' in event: d['notification']['content'] = event.content # We no longer send aliases separately, instead, we send the human