summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-01-08 10:03:09 +1100
committerGitHub <noreply@github.com>2019-01-08 10:03:09 +1100
commit1dcb086f33d93e0393901f8fe5b642e41e8292e1 (patch)
tree9236c1f9e0df3ac2367cbdc2071df62143547d47
parentFix command hint to generate a config file (#4353) (diff)
downloadsynapse-1dcb086f33d93e0393901f8fe5b642e41e8292e1.tar.xz
Fix synapse.config.__main__ on python 3 (#4356)
-rw-r--r--changelog.d/4356.bugfix1
-rw-r--r--synapse/config/__main__.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4356.bugfix b/changelog.d/4356.bugfix
new file mode 100644
index 0000000000..321eb05652
--- /dev/null
+++ b/changelog.d/4356.bugfix
@@ -0,0 +1 @@
+Fix `python -m synapse.config` on Python 3.
diff --git a/synapse/config/__main__.py b/synapse/config/__main__.py
index 79fe9c3dac..fca35b008c 100644
--- a/synapse/config/__main__.py
+++ b/synapse/config/__main__.py
@@ -16,7 +16,7 @@ from synapse.config._base import ConfigError
 
 if __name__ == "__main__":
     import sys
-    from homeserver import HomeServerConfig
+    from synapse.config.homeserver import HomeServerConfig
 
     action = sys.argv[1]