Commit 1953749
committed
Fix toc.empty_glob warning not being suppressible via suppress_warnings
The toctree glob-pattern warning emitted when no documents match was
introduced in 8.2.0 (#13230) with the new ``toc.empty_glob`` sub-type to
allow suppression via :confval:`suppress_warnings`. However, the
``logger.warning()`` call was missing the ``type='toc'`` keyword argument,
so ``SphinxLoggerAdapter`` stored ``type=None`` on the log record.
``is_suppressed_warning()`` short-circuits to ``False`` whenever
``warning_type is None``, so the warning could never be suppressed.
Fix by passing ``type='toc'`` alongside ``subtype='empty_glob'`` to match
every other toctree warning in the same function.1 parent cc7c6f4 commit 1953749
3 files changed
Lines changed: 30 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
21 | 25 | | |
22 | 26 | | |
23 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
| 122 | + | |
122 | 123 | | |
123 | 124 | | |
124 | 125 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
130 | 155 | | |
131 | 156 | | |
132 | 157 | | |
| |||
0 commit comments