Commit33e95c5

committed

Merge pull request#3111 from montefra/mlab_bug

bug fix: check the type of the 'key' of the two array 'r1' and 'r2'

2 parentsba72279 +590eeb8 commit33e95c5Copy full SHA for 33e95c5

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2631,8 +2631,11 @@ def key_desc(name):`
`2631`	`2631`	`ifdt1.type!=np.string_:`
`2632`	`2632`	`return (name,dt1.descr[0][1])`
`2633`	`2633`
`2634`		`-dt2=r1.dtype[name]`
`2635`		`-assertdt2==dt1`
	`2634`	`+dt2=r2.dtype[name]`
	`2635`	`+ifdt1!=dt2:`
	`2636`	`+msg="The '{}' fields in arrays 'r1' and 'r2' must have the same"`
	`2637`	`+msg+=" dtype."`
	`2638`	`+raiseValueError(msg.format(name))`
`2636`	`2639`	`ifdt1.num>dt2.num:`
`2637`	`2640`	`return (name,dt1.descr[0][1])`
`2638`	`2641`	`else:`

Comments

(0)