Skip to content

Cleanup: sorted, dict iteration, array.{ndim,size}, ... #7549

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 9 commits into from
Dec 22, 2016
Merged

Cleanup: sorted, dict iteration, array.{ndim,size}, ... #7549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70909c4
Cleanup: use `sorted()` whereever possible.
anntzer Dec 2, 2016
7a83fc4
Iterating over a dict is easy.
anntzer Dec 2, 2016
5bfd4b7
Use ndim, size whereever appropriate.
anntzer Dec 2, 2016
1d4192c
Use \N{} unicode entities.
anntzer Dec 2, 2016
39352a8
dict.keys() is nearly always useless.
anntzer Dec 2, 2016
338f6da
safezip is (mostly) overrated.
anntzer Dec 2, 2016
43f2f7c
alltrue and sometrue are known as all and any.
anntzer Dec 2, 2016
04062b6
Cleanup while 1: ... and file iteration.
anntzer Dec 3, 2016
14b47ba
More cleanups following PR comments.
anntzer Dec 4, 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
Prev Previous commit
Next Next commit
alltrue and sometrue are known as all and any.
  • Loading branch information
@anntzer
anntzer committed Dec 21, 2016
commit 43f2f7c46bc940716a8f25ae64d64d44d673a996
16 changes: 1 addition & 15 deletions lib/matplotlib/backends/backend_ps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,21 +170,7 @@ def quote_ps_string(s):
return s.decode('ascii')


def seq_allequal(seq1, seq2):
"""
seq1 and seq2 are either None or sequences or arrays
Return True if both are None or both are seqs with identical
elements
"""
if seq1 is None:
return seq2 is None

if seq2 is None:
return False
#ok, neither are None:, assuming iterable

if len(seq1) != len(seq2): return False
return np.alltrue(np.equal(seq1, seq2))
seq_allequal = np.array_equal
Copy link
Member

Choose a reason for hiding this comment

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

Hrm, is this even public?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Strictly speaking, it was; in practice I'm 100% sure we can just get rid of it...



class RendererPS(RendererBase):
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/colors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,8 @@ def _init(self):
def is_gray(self):
if not self._isinit:
self._init()
return (np.alltrue(self._lut[:, 0] == self._lut[:, 1]) and
np.alltrue(self._lut[:, 0] == self._lut[:, 2]))
return (np.all(self._lut[:, 0] == self._lut[:, 1]) and
np.all(self._lut[:, 0] == self._lut[:, 2]))

def _resample(self, lutsize):
"""
Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/figure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,7 @@ def autofmt_xdate(self, bottom=0.2, rotation=30, ha='right'):
*ha*
The horizontal alignment of the xticklabels
"""
allsubplots = np.alltrue([hasattr(ax, 'is_last_row') for ax
in self.axes])
allsubplots = all(hasattr(ax, 'is_last_row') for ax in self.axes)
if len(self.axes) == 1:
for label in self.axes[0].get_xticklabels():
label.set_ha(ha)
Expand Down
6 changes: 3 additions & 3 deletions lib/mpl_toolkits/mplot3d/proj3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ def proj_transform_vec_clip(vec, M):
w = vecw[3]
# clip here..
txs, tys, tzs = vecw[0]/w, vecw[1]/w, vecw[2]/w
tis = (vecw[0] >= 0) * (vecw[0] <= 1) * (vecw[1] >= 0) * (vecw[1] <= 1)
if np.sometrue(tis):
tis = vecw[1] < 1
tis = (vecw[0] >= 0) & (vecw[0] <= 1) & (vecw[1] >= 0) & (vecw[1] <= 1)
Copy link
Member

Choose a reason for hiding this comment

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

Since you're editing the line already, can you reorder it so that it looks like an implied and?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

if np.any(tis):
tis = vecw[1] < 1
return txs, tys, tzs, tis

def inv_transform(xs, ys, zs, M):
Expand Down