summary refs log tree commit diff
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2023-03-17 13:02:30 +0000
committerGitHub <noreply@github.com>2023-03-17 09:02:30 -0400
commit66fc166b966204d47ac438982a3a41137f614c4c (patch)
tree62867c62ea301cfd738c82ca6bf5ca9d60159408
parentRemove no-op send_command for Redis replication. (#15274) (diff)
downloadsynapse-66fc166b966204d47ac438982a3a41137f614c4c.tar.xz
Make `configure_workers_and_start` script used in Complement tests compatible with older versions of Python. (#15275)
-rw-r--r--changelog.d/15275.misc1
-rwxr-xr-xdocker/configure_workers_and_start.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/15275.misc b/changelog.d/15275.misc
new file mode 100644
index 0000000000..b222acd72b
--- /dev/null
+++ b/changelog.d/15275.misc
@@ -0,0 +1 @@
+Make `configure_workers_and_start` script used in Complement tests compatible with older versions of Python.
\ No newline at end of file
diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py
index cfb16c2e22..376f9ed635 100755
--- a/docker/configure_workers_and_start.py
+++ b/docker/configure_workers_and_start.py
@@ -422,7 +422,7 @@ def add_worker_roles_to_shared_config(
 
 
 def merge_worker_template_configs(
-    existing_dict: Dict[str, Any] | None,
+    existing_dict: Optional[Dict[str, Any]],
     to_be_merged_dict: Dict[str, Any],
 ) -> Dict[str, Any]:
     """When given an existing dict of worker template configuration consisting with both