diff options
| author | David Robertson <davidr@element.io> | 2022-03-01 17:44:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 17:44:41 +0000 |
| commit | 313581e4e9bc2ec3d59ccff86e3a0c02661f71c4 (patch) | |
| tree | e7cca1740f8fb1011201a3e05a973e6c9f513654 /synapse/config/saml2.py | |
| parent | Fix rare error in `ReadWriteLock` when writers complete immediately (#12105) (diff) | |
| download | synapse-313581e4e9bc2ec3d59ccff86e3a0c02661f71c4.tar.xz | |
Use importlib.metadata to read requirements (#12088)
* Pull runtime dep checks into their own module * Reimplement `check_requirements` using `importlib` I've tried to make this clearer. We start by working out which of Synapse's requirements we need to be installed here and now. I was surprised that there wasn't an easier way to see which packages were installed by a given extra. I've pulled out the error messages into functions that deal with "is this for an extra or not". And I've rearranged the loop over two different sets of requirements into one loop with a "must be instaled" flag. I hope you agree that this is clearer. * Test cases
Diffstat (limited to 'synapse/config/saml2.py')
| -rw-r--r-- | synapse/config/saml2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/saml2.py b/synapse/config/saml2.py index ec9d9f65e7..43c456d5c6 100644 --- a/synapse/config/saml2.py +++ b/synapse/config/saml2.py @@ -17,8 +17,8 @@ import logging from typing import Any, List, Set from synapse.config.sso import SsoAttributeRequirement -from synapse.python_dependencies import DependencyException, check_requirements from synapse.types import JsonDict +from synapse.util.check_dependencies import DependencyException, check_requirements from synapse.util.module_loader import load_module, load_python_module from ._base import Config, ConfigError |