Skip to content

Commit 89f393f

Browse files
committed
RadonBear: Handle col_offset==0 correctly
Radon uses visitor.col_offset as 0 for results where column is not given. As we use None, we simply map it appropriately. (As suggested by blueyed) Fixes #609
1 parent b7b42c5 commit 89f393f

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

bears/python/RadonBear.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ def run(self, filename, file,
4545
if severity is None:
4646
continue
4747

48+
col = visitor.col_offset if visitor.col_offset else None
4849
visitor_range = SourceRange.from_values(
49-
filename, visitor.lineno, visitor.col_offset, visitor.endline)
50+
filename, visitor.lineno, col, visitor.endline)
5051
message = "{} has a cyclomatic complexity of {}".format(
5152
visitor.name, rank)
5253

tests/python/RadonBearTest.py

+12-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,21 @@ class class1():
1212
pass
1313
"""
1414

15+
test_file3 = "def f():\n" + (" assert True\n" * 50)
1516

16-
RadonBearNoReportsTest = verify_local_bear(
17+
18+
RadonBearDefaultsTest = verify_local_bear(
1719
RadonBear,
1820
valid_files=(test_file1, test_file2),
19-
invalid_files=(),
20-
settings={"radon_ranks_info": "",
21-
"radon_ranks_normal": "",
22-
"radon_ranks_major": ""})
21+
invalid_files=(test_file3,))
22+
23+
24+
RadonBearNoReportsTest = verify_local_bear(RadonBear,
25+
valid_files=(test_file1, test_file2, test_file3),
26+
invalid_files=(),
27+
settings={"radon_ranks_info": "",
28+
"radon_ranks_normal": "",
29+
"radon_ranks_major": ""})
2330

2431

2532
RadonBearReportsTest = verify_local_bear(

0 commit comments

Comments
 (0)