diff options
| author | David Robertson <davidr@element.io> | 2021-10-08 14:49:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-08 14:49:41 +0100 |
| commit | 797ee7812db28f6cf130d68e2d10911c826b0be5 (patch) | |
| tree | 7dc5c31a4f18ebdcdcae21d9987f85bfd8892a45 /synapse/util | |
| parent | Fix overwriting profile when making room public (#11003) (diff) | |
| download | synapse-797ee7812db28f6cf130d68e2d10911c826b0be5.tar.xz | |
Relax `ignore-missing-imports` for modules that have stubs now and update mypy (#11006)
Updating mypy past version 0.9 means that third-party stubs are no-longer distributed with typeshed. See http://mypy-lang.blogspot.com/2021/06/mypy-0900-released.html for details. We therefore pull in stub packages in setup.py Additionally, some modules that we were previously ignoring import failures for now have stubs. So let's use them. The rest of this change consists of fixups to make the newer mypy + stubs pass CI. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 64daff59df..abf53d149d 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -51,7 +51,10 @@ def _handle_frozendict(obj: Any) -> Dict[Any, Any]: # fishing the protected dict out of the object is a bit nasty, # but we don't really want the overhead of copying the dict. try: - return obj._dict + # Safety: we catch the AttributeError immediately below. + # See https://github.com/matrix-org/python-canonicaljson/issues/36#issuecomment-927816293 + # for discussion on how frozendict's internals have changed over time. + return obj._dict # type: ignore[attr-defined] except AttributeError: # When the C implementation of frozendict is used, # there isn't a `_dict` attribute with a dict |