Commit55894c2

authored

Merge pull request#16382 from meeseeksmachine/auto-backport-of-pr-16379-on-v3.1.x

Backport PR#16379 on branch v3.1.x (FIX: catch on message content, not module)

2 parentsbbf4c7c +85e3f1c commit55894c2Copy full SHA for 55894c2

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1414,9 +1414,10 @@ def _check_1d(x):`
`1414`	`1414`	`# This code should correctly identify and coerce to a`
`1415`	`1415`	`# numpy array all pandas versions.`
`1416`	`1416`	`withwarnings.catch_warnings(record=True)asw:`
`1417`		`-warnings.filterwarnings("always",`
`1418`		`-category=DeprecationWarning,`
`1419`		`-module='pandas[.*]')`
	`1417`	`+warnings.filterwarnings(`
	`1418`	`+"always",`
	`1419`	`+category=DeprecationWarning,`
	`1420`	`+message='Support for multi-dimensional indexing')`
`1420`	`1421`
`1421`	`1422`	`ndim=x[:,None].ndim`
`1422`	`1423`	`# we have definitely hit a pandas index or series object`

Comments

(0)