Skip to content

Commit 8761688

Browse files
committed
Refactor code to replace collections.Mapping with dict
1 parent 706abf0 commit 8761688

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

microSALT/app/app.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import collections
21
import logging
32
import json
43
import os
@@ -56,7 +55,7 @@ def handle_config_entry(entry, value, logger):
5655
if not value.startswith("/"):
5756
sys.exit(-1)
5857
create_path(os.path.abspath(value), logger)
59-
elif isinstance(value, collections.Mapping):
58+
elif isinstance(value, dict):
6059
for sub_entry, sub_value in value.items():
6160
handle_config_entry(sub_entry, sub_value, logger)
6261

tests/test_config.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env python
22

3-
import collections
43
import os
54
import pathlib
65
import pytest
@@ -33,7 +32,7 @@ def test_existence(exp_config):
3332
assert entry in config_level_one
3433

3534
# level two
36-
if isinstance(preset_config[entry], collections.Mapping):
35+
if isinstance(preset_config[entry], dict):
3736
config_level_two = preset_config[entry].keys()
3837
for thing in exp_config[entry]:
3938
assert thing in config_level_two
@@ -49,7 +48,7 @@ def test_reverse_existence(exp_config):
4948

5049
# level two
5150
config_level_two = exp_config[entry]
52-
if isinstance(preset_config[entry], collections.Mapping):
51+
if isinstance(preset_config[entry], dict):
5352
for thing in preset_config[entry].keys():
5453
if thing != '_comment':
5554
assert thing in config_level_two
@@ -68,7 +67,7 @@ def test_paths(exp_config):
6867
assert (pathlib.Path(unmade_fldr).exists())
6968

7069
# level two
71-
elif isinstance(preset_config[entry], collections.Mapping):
70+
elif isinstance(preset_config[entry], dict):
7271
for thing in preset_config[entry].keys():
7372
if isinstance(preset_config[entry][thing], str) and '/' in preset_config[entry][thing] and entry not in ['database', 'genologics']:
7473
unmade_fldr = preset_config[entry][thing]

0 commit comments

Comments
 (0)