Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tacaswell merged 2 commits into from
Jun 4, 2014
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
663c3db
bug fix: check the type of the 'key' of the two array 'r1' and 'r2'
montefra Jun 3, 2014
590eeb8
Error message written in proper English
montefra Jun 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/matplotlib/mlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2631,8 +2631,11 @@ def key_desc(name):
if dt1.type != np.string_:
return (name, dt1.descr[0][1])

dt2 = r1.dtype[name]
assert dt2==dt1
dt2 = r2.dtype[name]
if dt1 != dt2:
msg = "The type of the '{}' in the arrays 'r1' and 'r2' must be of"
msg += " the same type"

@efiring efiring Jun 3, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or "The '{}' fields in arrays 'r1' and 'r2' must have the same dtype." Right?

raise ValueError(msg.format(name))
if dt1.num>dt2.num:
return (name, dt1.descr[0][1])
else:
Expand Down