diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-07-11 04:22:46 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 04:22:46 +1000 |
| commit | 129ffd7b88ddedc9ca67129801e34b37b38221d2 (patch) | |
| tree | 0d2a1268a3c5394b02fcc1f95aced0e1d746b30b | |
| parent | s/becuase/because/g (diff) | |
| parent | changelog entry (diff) | |
| download | synapse-129ffd7b88ddedc9ca67129801e34b37b38221d2.tar.xz | |
Merge pull request #3498 from OlegGirko/fix_attrs_syntax
* 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-- | changelog.d/3498.misc | 0 | ||||
| -rw-r--r-- | tests/server.py | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/3498.misc b/changelog.d/3498.misc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/changelog.d/3498.misc 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): |