Skip to content

Commit 2f2bc56

Browse files
committedOct 3, 2021
RCorrect deepsource errors
1 parent 36fcf39 commit 2f2bc56

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed
 

‎isort/api.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ def check_file(
328328
if "config_trie" in config_kwargs:
329329
config_trie = config_kwargs.pop("config_trie", None)
330330
if config_trie:
331-
config_info = config_trie._search(filename)
331+
config_info = config_trie.search(filename)
332332
if config.verbose:
333333
print(f"{config_info[0]} used for file {filename}")
334334

@@ -396,7 +396,7 @@ def sort_file(
396396
if "config_trie" in config_kwargs:
397397
config_trie = config_kwargs.pop("config_trie", None)
398398
if config_trie:
399-
config_info = config_trie._search(filename)
399+
config_info = config_trie.search(filename)
400400
if config.verbose:
401401
print(f"{config_info[0]} used for file {filename}")
402402

‎isort/settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ def find_all_configs(src_paths: Tuple[str]) -> Trie:
807807
config_data = {}
808808

809809
if config_data:
810-
trie_root._insert(potential_config_file, config_data)
810+
trie_root.insert(potential_config_file, config_data)
811811
break
812812

813813
return trie_root

‎isort/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Trie:
2222
def __init__(self, config_file: str = "", config_data: Optional[Dict[str, Any]] = None) -> None:
2323
self.root: TrieNode = TrieNode(config_file, config_data)
2424

25-
def _insert(self, config_file: str, config_data: Dict[str, Any]) -> None:
25+
def insert(self, config_file: str, config_data: Dict[str, Any]) -> None:
2626
resolved_config_path_as_tuple = Path(config_file).parent.resolve().parts
2727

2828
temp = self.root
@@ -35,7 +35,7 @@ def _insert(self, config_file: str, config_data: Dict[str, Any]) -> None:
3535

3636
temp.config_info = (config_file, config_data)
3737

38-
def _search(self, filename: str) -> Tuple[str, Dict[str, Any]]:
38+
def search(self, filename: str) -> Tuple[str, Dict[str, Any]]:
3939
"""
4040
Returns the closest config relative to filename by doing a depth
4141
first search on the prefix tree.

‎tests/unit/test_settings.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,17 @@ def test_find_all_configs(tmpdir):
274274

275275
config_trie = settings.find_all_configs((str(tmpdir),))
276276

277-
config_info_1 = config_trie._search(str(dir1 / "test1.py"))
277+
config_info_1 = config_trie.search(str(dir1 / "test1.py"))
278278
assert config_info_1[0] == str(setup_cfg_file)
279279
assert "profile" in config_info_1[1] and config_info_1[1]["profile"] == "django"
280280

281-
config_info_2 = config_trie._search(str(dir2 / "test2.py"))
281+
config_info_2 = config_trie.search(str(dir2 / "test2.py"))
282282
assert config_info_2[0] == str(pyproject_toml_file)
283283
assert "profile" in config_info_2[1] and config_info_2[1]["profile"] == "hug"
284284

285-
config_info_3 = config_trie._search(str(dir3 / "test3.py"))
285+
config_info_3 = config_trie.search(str(dir3 / "test3.py"))
286286
assert config_info_3[0] == str(isort_cfg_file)
287287
assert "profile" in config_info_3[1] and config_info_3[1]["profile"] == "black"
288288

289-
config_info_4 = config_trie._search(str(tmpdir / "file4.py"))
289+
config_info_4 = config_trie.search(str(tmpdir / "file4.py"))
290290
assert config_info_4[0] == "default"

‎tests/unit/test_utils.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
def test_trie():
55
trie_root = Trie("default", {"line_length": 70})
66

7-
trie_root._insert("/temp/config1/.isort.cfg", {"line_length": 71})
8-
trie_root._insert("/temp/config2/setup.cfg", {"line_length": 72})
9-
trie_root._insert("/temp/config3/pyproject.toml", {"line_length": 73})
7+
trie_root.insert("/temp/config1/.isort.cfg", {"line_length": 71})
8+
trie_root.insert("/temp/config2/setup.cfg", {"line_length": 72})
9+
trie_root.insert("/temp/config3/pyproject.toml", {"line_length": 73})
1010

1111
# Ensure that appropriate configs are resolved for files in different directories
12-
config1 = trie_root._search("/temp/config1/subdir/file1.py")
12+
config1 = trie_root.search("/temp/config1/subdir/file1.py")
1313
assert config1[0] == "/temp/config1/.isort.cfg"
1414
assert config1[1] == {"line_length": 71}
1515

16-
config1_2 = trie_root._search("/temp/config1/file1_2.py")
16+
config1_2 = trie_root.search("/temp/config1/file1_2.py")
1717
assert config1_2[0] == "/temp/config1/.isort.cfg"
1818
assert config1_2[1] == {"line_length": 71}
1919

20-
config2 = trie_root._search("/temp/config2/subdir/subsubdir/file2.py")
20+
config2 = trie_root.search("/temp/config2/subdir/subsubdir/file2.py")
2121
assert config2[0] == "/temp/config2/setup.cfg"
2222
assert config2[1] == {"line_length": 72}
2323

24-
config2_2 = trie_root._search("/temp/config2/subdir/file2_2.py")
24+
config2_2 = trie_root.search("/temp/config2/subdir/file2_2.py")
2525
assert config2_2[0] == "/temp/config2/setup.cfg"
2626
assert config2_2[1] == {"line_length": 72}
2727

28-
config3 = trie_root._search("/temp/config3/subdir/subsubdir/subsubsubdir/file3.py")
28+
config3 = trie_root.search("/temp/config3/subdir/subsubdir/subsubsubdir/file3.py")
2929
assert config3[0] == "/temp/config3/pyproject.toml"
3030
assert config3[1] == {"line_length": 73}
3131

32-
config3_2 = trie_root._search("/temp/config3/file3.py")
32+
config3_2 = trie_root.search("/temp/config3/file3.py")
3333
assert config3_2[0] == "/temp/config3/pyproject.toml"
3434
assert config3_2[1] == {"line_length": 73}
3535

36-
config_outside = trie_root._search("/temp/file.py")
36+
config_outside = trie_root.search("/temp/file.py")
3737
assert config_outside[0] == "default"
3838
assert config_outside[1] == {"line_length": 70}

0 commit comments

Comments
 (0)
Please sign in to comment.