diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2021-10-31 09:51:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 09:51:14 +0300 |
| commit | 4475dab99e9eaa4677bbba464aef3dc607f9dd1b (patch) | |
| tree | 403cae71e315d42c79608724a0bc5b2f1e184493 /sphinx/util/logging.py | |
| parent | cda266333e8ec61a08b9a4b9329d089a2124cd42 (diff) | |
| parent | e38456d4e14ffa28c7444198959410a84bfcd10f (diff) | |
Merge pull request #9656 from sdhiscocks/suppress_warning_subtype_none
Fix issue with warnings without subtype being incorrectly suppressed
Diffstat (limited to 'sphinx/util/logging.py')
| -rw-r--r-- | sphinx/util/logging.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/util/logging.py b/sphinx/util/logging.py index d4d843e58..337c87b92 100644 --- a/sphinx/util/logging.py +++ b/sphinx/util/logging.py @@ -369,7 +369,8 @@ def is_suppressed_warning(type: str, subtype: str, suppress_warnings: List[str]) target, subtarget = warning_type, None if target == type: - if (subtype is None or subtarget is None or + if (subtype is None and subtarget is None + or subtarget is None or subtarget == subtype or subtarget == '*'): return True |