Mercurial > hgrepos > Python > libs > ConfigMix
comparison configmix/__init__.py @ 256:7e26d31f52de
FIX: Allow non-text keys when merging: handle .startswith() errors gracefully
| author | Franz Glasner <f.glasner@feldmann-mg.com> |
|---|---|
| date | Wed, 08 Jul 2020 10:26:44 +0200 |
| parents | 16bcd85c7d28 |
| children | 428158054729 |
comparison
equal
deleted
inserted
replaced
| 255:3ecceab78951 | 256:7e26d31f52de |
|---|---|
| 448 _filter_comments(d[k]) | 448 _filter_comments(d[k]) |
| 449 | 449 |
| 450 | 450 |
| 451 def _is_comment(k): | 451 def _is_comment(k): |
| 452 for i in COMMENTS: | 452 for i in COMMENTS: |
| 453 if k.startswith(i): | 453 try: |
| 454 return True | 454 if k.startswith(i): |
| 455 return True | |
| 456 except AttributeError: | |
| 457 # non-string key | |
| 458 return False | |
| 455 return False | 459 return False |
| 456 | 460 |
| 457 | 461 |
| 458 # | 462 # |
| 459 # Init loader defaults: mode->loader and extension->mode | 463 # Init loader defaults: mode->loader and extension->mode |
