Commit 3f29817
authored
🐛 fix(macos): yield individual site dirs in iter_*_dirs (#429)
On macOS, `iter_data_dirs()` and `iter_config_dirs()` were falling back
to the base class implementation which yields `site_data_dir` as a
single string. When `XDG_DATA_DIRS` is set with multiple paths (common
on NixOS and similar setups) or under Homebrew where multiple site
directories exist, this produced a colon-joined string like
`/path1:/path2` instead of yielding each directory individually. 🐛
The Unix platform already overrides both methods to `yield from
self._site_data_dirs` / `self._site_config_dirs`, correctly producing
individual paths. macOS has the same `_site_data_dirs` and
`_site_config_dirs` properties (Homebrew-aware + XDG mixin) but was
missing the matching overrides. This adds the identical overrides to
`_MacOSDefaults`, consistent with the existing Unix approach.
Windows is unaffected since it only has single-value site directories
with no `_site_data_dirs` property.
Fixes #3771 parent 170391e commit 3f29817
2 files changed
Lines changed: 56 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
9 | 12 | | |
10 | 13 | | |
11 | 14 | | |
| |||
137 | 140 | | |
138 | 141 | | |
139 | 142 | | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
140 | 153 | | |
141 | 154 | | |
142 | 155 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
268 | 268 | | |
269 | 269 | | |
270 | 270 | | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
0 commit comments