diff options
| author | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-07-18 22:49:56 +0100 |
|---|---|---|
| committer | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-07-18 22:49:56 +0100 |
| commit | 94024e6efaa23869a6141dba05118c158d3d3f8f (patch) | |
| tree | 1bfccc5447ca099627c4c31f536d7082b7b9eb6a /sphinx/config.py | |
| parent | a4d41aa889388bf8ee2815d4819235b5ca978a8d (diff) | |
| parent | eb0a6c574fd18d5c5d903e5d07cba8cafc376ee0 (diff) | |
| download | sphinx-git-94024e6efaa23869a6141dba05118c158d3d3f8f.tar.gz | |
Merge branch '5.x'
# Conflicts:
# sphinx/ext/autodoc/__init__.py
# sphinx/writers/html5.py
Diffstat (limited to 'sphinx/config.py')
| -rw-r--r-- | sphinx/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sphinx/config.py b/sphinx/config.py index 2fb41f066..92395dd27 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -158,7 +158,9 @@ class Config: self.extensions: List[str] = config.get('extensions', []) @classmethod - def read(cls, confdir: str, overrides: Dict = None, tags: Tags = None) -> "Config": + def read( + cls, confdir: str, overrides: Optional[Dict] = None, tags: Optional[Tags] = None + ) -> "Config": """Create a Config object from configuration file.""" filename = path.join(confdir, CONFIG_FILENAME) if not path.isfile(filename): |