Fix a chicken-egg issue.

matrix-org · Jul 23, 2020 · 20c7aae · 20c7aae
1 parent e695a1d
commit 20c7aae
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -21,8 +21,6 @@
 import os
 import sys
 
-from canonicaljson import set_json_library
-
 # Check that we're not running on an unsupported Python version.
 if sys.version_info < (3, 5):
     print("Synapse requires Python 3.5 or above.")
@@ -40,7 +38,12 @@
     pass
 
 # Use the standard library json implementation instead of simplejson.
-set_json_library(json)
+try:
+    from canonicaljson import set_json_library
+
+    set_json_library(json)
+except ImportError:
+    pass
 
 __version__ = "1.17.0"