Commit23e3fb5

authored

Merge pull request#10624 from charris/backport-10623

BUG: Correctly identify comma seperated dtype strings

2 parentsd0ba54f +b48c804 commit23e3fb5Copy full SHA for 23e3fb5

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ _check_for_commastring(char *type, Py_ssize_t len)`
`198`	`198`	`* allows commas inside of [], for parameterized dtypes to use.`
`199`	`199`	`*/`
`200`	`200`	`sqbracket=0;`
`201`		`-for (i=1;i<len;i++) {`
	`201`	`+for (i=0;i<len;i++) {`
`202`	`202`	`switch (type[i]) {`
`203`	`203`	`case',':`
`204`	`204`	`if (sqbracket==0) {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -719,5 +719,10 @@ def test_dtypes_are_true():`
`719`	`719`	`assertbool(np.dtype([('a','i8'), ('b','f4')]))`
`720`	`720`
`721`	`721`
	`722`	`+deftest_invalid_dtype_string():`
	`723`	`+# test for gh-10440`
	`724`	`+assert_raises(TypeError,np.dtype,'f8,i8,[f8,i8]')`
	`725`	`+`
	`726`	`+`
`722`	`727`	`if__name__=="__main__":`
`723`	`728`	`run_module_suite()`

Comments

(0)