Skip to content

Commit 268615a

Browse files
authored
Merge pull request #422 from DimitriPapadopoulos/B
Enforce ruff/flake8-bugbear rules (B)
2 parents 52dc17b + 3681fa5 commit 268615a

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ line-length = 99
5656
exclude = ["tabulate/_version.py"]
5757

5858
[tool.ruff.lint]
59-
extend-select = ["W", "C4", "ISC", "I", "C90", "UP"]
60-
ignore = ["E721", "C901"]
59+
extend-select = ["W", "B", "C4", "ISC", "I", "C90", "UP"]
60+
ignore = ["B905", "E721", "C901"]
6161

6262
[tool.ruff.lint.mccabe]
6363
max-complexity = 22

tabulate/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,8 +1477,8 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"):
14771477
keys = tabular_data.keys()
14781478
try:
14791479
rows = list(izip_longest(*tabular_data.values())) # columns have to be transposed
1480-
except TypeError: # not iterable
1481-
raise TypeError(err_msg)
1480+
except TypeError as e: # not iterable
1481+
raise TypeError(err_msg) from e
14821482

14831483
elif hasattr(tabular_data, "index"):
14841484
# values is a property, has .index => it's likely a pandas.DataFrame (pandas 0.11.0)
@@ -1501,8 +1501,8 @@ def _normalize_tabular_data(tabular_data, headers, showindex="default"):
15011501
else: # it's a usual iterable of iterables, or a NumPy array, or an iterable of dataclasses
15021502
try:
15031503
rows = list(tabular_data)
1504-
except TypeError: # not iterable
1505-
raise TypeError(err_msg)
1504+
except TypeError as e: # not iterable
1505+
raise TypeError(err_msg) from e
15061506

15071507
if headers == "keys" and not rows:
15081508
# an empty table (issue #81)

test/test_regression.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def mk_iter_of_iters():
9797
def mk_iter():
9898
yield from range(3)
9999

100-
for r in range(3):
100+
for _ in range(3):
101101
yield mk_iter()
102102

103103
def mk_headers():
@@ -357,7 +357,7 @@ def test_numpy_array_as_headers():
357357
expected = "foo bar"
358358
assert_equal(expected, result)
359359
except ImportError:
360-
raise skip("")
360+
raise skip("") from None
361361

362362

363363
def test_boolean_columns():
@@ -477,7 +477,7 @@ def test_numpy_array_as_showindex():
477477
try:
478478
import numpy as np
479479
except ImportError:
480-
raise skip("")
480+
raise skip("") from None
481481

482482
table = [["a"], ["b"], ["c"]]
483483
# np.array([...]) == "default" returns an element-wise boolean array whose
@@ -548,7 +548,7 @@ def test_numpy_int64_as_integer():
548548
)
549549
assert_equal(expected, result)
550550
except ImportError:
551-
raise skip("")
551+
raise skip("") from None
552552

553553

554554
def test_empty_table_with_colalign():

0 commit comments

Comments
 (0)