summary refs log tree commit diff
diff options
context:
space:
mode:
authorOleg Girko <ol@infoserver.lv>2018-07-10 00:11:39 +0100
committerOleg Girko <ol@infoserver.lv>2018-07-10 00:38:49 +0100
commit6c1ec5a1bdfaed2d13a501fd2441d99c73711adb (patch)
tree57753ab1cfe2c38cb4310cfd698f107bf997c777
parentMerge pull request #3464 from matrix-org/hawkowl/isort-run (diff)
downloadsynapse-6c1ec5a1bdfaed2d13a501fd2441d99c73711adb.tar.xz
Use more portable syntax using attrs package.
Newer syntax

    attr.ib(factory=dict)

is just a syntactic sugar for

    attr.ib(default=attr.Factory(dict))

It was introduced in newest version of attrs package (18.1.0)
and doesn't work with older versions.

We should either require minimum version of attrs to be 18.1.0,
or use older (slightly more verbose) syntax.
Requiring newest version is not a good solution because
Linux distributions may have older version of attrs (17.4.0 in Fedora 28),
and requiring to build (and package)
newer version just to use newer syntactic sugar in only one test
is just too much.
It's much better to fix that test to use older syntax.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
-rw-r--r--tests/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/server.py b/tests/server.py
index 46223ccf05..e93f5a7f94 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -22,7 +22,7 @@ class FakeChannel(object):
     wire).
     """
 
-    result = attr.ib(factory=dict)
+    result = attr.ib(default=attr.Factory(dict))
 
     @property
     def json_body(self):