Skip to content

Remove some numpy 1.6 workarounds #7494

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
merged 11 commits into from
Nov 24, 2016
Merged

Remove some numpy 1.6 workarounds #7494

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
207edcf
Remove local definition of putmask
dstansby Nov 21, 2016
8ce11f2
Use minlength kwarg
dstansby Nov 21, 2016
79b9ee0
Simplifiy to_array for numpy >= 1.7
dstansby Nov 21, 2016
3a42131
Replace _putmask calls with copyto calls
dstansby Nov 21, 2016
77dbccc
Remove old to_array method
dstansby Nov 21, 2016
74d2d33
Simplify convert_to_string for numpy >= 1.7
dstansby Nov 21, 2016
fcef8fd
Use numpy's unicode type in covert_to_string
dstansby Nov 21, 2016
aa0e899
Fix convert_to_string method
dstansby Nov 21, 2016
13c965d
Remove convert_to_string method
dstansby Nov 21, 2016
2983fbd
Remove category string conversion test
dstansby Nov 21, 2016
430f789
Remove old numpy 1.6 comment
dstansby Nov 21, 2016
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
Next Next commit
Remove local definition of putmask
  • Loading branch information
@dstansby
dstansby committed Nov 21, 2016
commit 207edcfc5b9566162e92fcacb687626144b44db0
17 changes: 0 additions & 17 deletions lib/matplotlib/cbook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2582,23 +2582,6 @@ def get_label(y, default_name):
except AttributeError:
return default_name

# Numpy > 1.6.x deprecates putmask in favor of the new copyto.
# So long as we support versions 1.6.x and less, we need the
# following local version of putmask. We choose to make a
# local version of putmask rather than of copyto because the
# latter includes more functionality than the former. Therefore
# it is easy to make a local version that gives full putmask
# behavior, but duplicating the full copyto behavior would be
# more difficult.

try:
np.copyto
except AttributeError:
_putmask = np.putmask
else:
def _putmask(a, mask, values):
return np.copyto(a, values, where=mask)

_lockstr = """\
LOCKERROR: matplotlib is trying to acquire the lock
{!r}
Expand Down