Skip to content

Commit 5361ac9

Browse files
committed
fix some style errors
1 parent 39f834b commit 5361ac9

File tree

8 files changed

+29
-31
lines changed

8 files changed

+29
-31
lines changed

netcompare/evaluator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"""Diff evaluator."""
22
import re
33
import sys
4-
from deepdiff import DeepDiff
54
from collections import defaultdict
65
from collections.abc import Mapping as DictMapping
76
from functools import partial
87
from typing import Mapping, List
8+
from deepdiff import DeepDiff
99

1010

1111
sys.path.append(".")

netcompare/runner.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/ur/bin/env python3
22
import re
33
import jmespath
4-
from typing import Mapping, List, Generator, Union
4+
from typing import Mapping, List, Union
55
from .utils.jmspath.parsers import jmspath_value_parser, jmspath_refkey_parser
6-
from .utils.data.parsers import exclude_filter, get_values
6+
from .utils.data.parsers import exclude_filter, get_values
77

88

99
def extract_values_from_output(value: Mapping, path: Mapping, exclude: List) -> Union[Mapping, List, int, str, bool]:
@@ -48,8 +48,6 @@ def extract_values_from_output(value: Mapping, path: Mapping, exclude: List) ->
4848
return filtered_value
4949

5050

51-
52-
5351
def associate_key_of_my_value(paths: Mapping, wanted_value: List) -> List:
5452
"""
5553
Associate each key defined in path to every value found in output.

netcompare/utils/data/parsers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from ..list.flatten import flatten_list
44
from ...runner import associate_key_of_my_value
55

6+
67
def exclude_filter(data: Mapping, exclude: List):
78
"""
89
Recusively look through all dict keys and pop out the one defined in "exclude".
@@ -66,4 +67,4 @@ def get_values(path: Mapping, wanted_value):
6667
filtered_value = associate_key_of_my_value(jmspath_value_parser(path), wanted_value)
6768
else:
6869
filtered_value = wanted_value
69-
return filtered_value
70+
return filtered_value

netcompare/utils/data/tests/test_parsers.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env python3
22

3-
import pytest
43
import sys
4+
import pytest
55
from ..parsers import exclude_filter
6+
67
sys.path.append("..")
78

89

@@ -15,29 +16,25 @@
1516
["interfaceStatistics"],
1617
{
1718
"interfaces": {
18-
"Management1": {
19-
"name": "Management1",
20-
"interfaceStatus": "connected",
21-
"autoNegotiate": "success",
22-
"interfaceStatistics": {
23-
"inBitsRate": 3403.4362520883615,
24-
"inPktsRate": 3.7424095978179257,
25-
"outBitsRate": 16249.69114419833,
26-
"updateInterval": 300,
27-
"outPktsRate": 2.1111866059750692
28-
}
19+
"Management1": {
20+
"name": "Management1",
21+
"interfaceStatus": "connected",
22+
"autoNegotiate": "success",
23+
"interfaceStatistics": {
24+
"inBitsRate": 3403.4362520883615,
25+
"inPktsRate": 3.7424095978179257,
26+
"outBitsRate": 16249.69114419833,
27+
"updateInterval": 300,
28+
"outPktsRate": 2.1111866059750692,
29+
},
2930
}
3031
}
3132
},
3233
{
3334
"interfaces": {
34-
"Management1": {
35-
"name": "Management1",
36-
"interfaceStatus": "connected",
37-
"autoNegotiate": "success"
38-
}
35+
"Management1": {"name": "Management1", "interfaceStatus": "connected", "autoNegotiate": "success"}
3936
}
40-
}
37+
},
4138
)
4239

4340
exclude_filter_tests = [

netcompare/utils/jmspath/parsers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import re
2-
from typing import Mapping, List
2+
from typing import Mapping
3+
34

45
def jmspath_value_parser(path: Mapping):
56
"""
@@ -45,4 +46,3 @@ def jmspath_refkey_parser(path: Mapping):
4546
splitted_jmspath = splitted_jmspath[: n + 1]
4647

4748
return ".".join(splitted_jmspath)
48-

netcompare/utils/jmspath/tests/test_parsers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import pytest
44
import sys
55
from ..parsers import jmspath_value_parser, jmspath_refkey_parser
6+
67
sys.path.append("..")
78

89

@@ -66,6 +67,7 @@ def test_value_parser(path, expected_output):
6667
output = jmspath_value_parser(path)
6768
assert expected_output == output, assertion_failed_message.format(output=output, expected_output=expected_output)
6869

70+
6971
@pytest.mark.parametrize("path, expected_output", keyref_parser_tests)
7072
def test_keyref_parser(path, expected_output):
7173
output = jmspath_refkey_parser(path)

netcompare/utils/list/flatten.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from typing import Mapping, List, Generator, Union
1+
from typing import List, Generator
2+
23

34
def flatten_list(my_list: List) -> List:
45
"""
@@ -15,6 +16,7 @@ def flatten_list(my_list: List) -> List:
1516
>>> flatten_list(my_list)
1617
[[[[-1, 0], [-1, 0]]]]
1718
"""
19+
1820
def iter_flatten_list(my_list: List) -> Generator[List, None, None]:
1921
"""Recursively yield all flat lists within a given list."""
2022
if is_flat_list(my_list):
@@ -23,7 +25,6 @@ def iter_flatten_list(my_list: List) -> Generator[List, None, None]:
2325
for item in my_list:
2426
yield from iter_flatten_list(item)
2527

26-
2728
def is_flat_list(obj: List) -> bool:
2829
"""Return True is obj is a list that does not contain any lists as its first order elements."""
2930
return isinstance(obj, list) and not any(isinstance(i, list) for i in obj)
@@ -33,5 +34,3 @@ def is_flat_list(obj: List) -> bool:
3334
if is_flat_list(my_list):
3435
return my_list
3536
return list(iter_flatten_list(my_list))
36-
37-

netcompare/utils/list/tests/test_flatten.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import pytest
44
import sys
5-
import pdb
65
from ..flatten import flatten_list
6+
77
sys.path.append("..")
88

99

@@ -21,6 +21,7 @@
2121
flatten_list_case_1,
2222
]
2323

24+
2425
@pytest.mark.parametrize("data, expected_output", flatten_list_tests)
2526
def test_value_parser(data, expected_output):
2627
output = flatten_list(data)

0 commit comments

Comments
 (0)