Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f285c3f

Browse filesBrowse files
authored
Merge pull request #24630 from ShawnZhong/main
Improve error message for gridspec when the index is not an integer.
2 parents 9d22ab0 + c0f4bab commit f285c3f
Copy full SHA for f285c3f

File tree

Expand file treeCollapse file tree

2 files changed

+10
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+10
-3
lines changed

‎lib/matplotlib/gridspec.py

Copy file name to clipboardExpand all lines: lib/matplotlib/gridspec.py
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,9 @@ def _from_subplot_args(figure, args):
601601
else:
602602
if not isinstance(num, Integral) or num < 1 or num > rows*cols:
603603
raise ValueError(
604-
f"num must be 1 <= num <= {rows*cols}, not {num!r}")
604+
f"num must be an integer with 1 <= num <= {rows*cols}, "
605+
f"not {num!r}"
606+
)
605607
i = j = num
606608
return gs[i-1:j]
607609

‎lib/matplotlib/tests/test_figure.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_figure.py
+7-2Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,15 @@ def test_add_subplot_invalid():
236236
with pytest.raises(ValueError,
237237
match='Number of rows must be a positive integer'):
238238
fig.add_subplot(0, 2, 1)
239-
with pytest.raises(ValueError, match='num must be 1 <= num <= 4'):
239+
with pytest.raises(ValueError, match='num must be an integer with '
240+
'1 <= num <= 4'):
240241
fig.add_subplot(2, 2, 0)
241-
with pytest.raises(ValueError, match='num must be 1 <= num <= 4'):
242+
with pytest.raises(ValueError, match='num must be an integer with '
243+
'1 <= num <= 4'):
242244
fig.add_subplot(2, 2, 5)
245+
with pytest.raises(ValueError, match='num must be an integer with '
246+
'1 <= num <= 4'):
247+
fig.add_subplot(2, 2, 0.5)
243248

244249
with pytest.raises(ValueError, match='must be a three-digit integer'):
245250
fig.add_subplot(42)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.