Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 26710ad

Browse filesBrowse files
committed
Merge v1.4.x back into master
2 parents 2147ca8 + 71ba349 commit 26710ad
Copy full SHA for 26710ad

File tree

Expand file treeCollapse file tree

4 files changed

+18
-14
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+18
-14
lines changed

‎INSTALL

Copy file name to clipboardExpand all lines: INSTALL
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,4 +322,4 @@ Framework with Visual Studio). In addition to Visual Studio `CMake
322322

323323
Since there is no canonical Windows package manager the build methods for
324324
freetype, zlib, libpng, tcl, & tk source code are documented as a build script
325-
at `matplotlib-winbuild <https://github.com/jbmohler/matplotlib-winbuild>`.
325+
at `matplotlib-winbuild <https://github.com/jbmohler/matplotlib-winbuild>`_.

‎lib/matplotlib/backend_bases.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backend_bases.py
+8-6Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,21 @@ def import_module(name):
9898
}
9999

100100

101-
def register_backend(format, backend, description):
101+
def register_backend(format, backend, description=None):
102102
"""
103103
Register a backend for saving to a given file format.
104104
105-
*format*
105+
format : str
106106
File extention
107107
108-
*backend*
109-
Backend for handling file output (module string or canvas class)
108+
backend : module string or canvas class
109+
Backend for handling file output
110110
111-
*description*
112-
Description of the file type
111+
description : str, optional
112+
Description of the file type. Defaults to an empty string
113113
"""
114+
if description is None:
115+
description = ''
114116
_default_backends[format] = backend
115117
_default_filetypes[format] = description
116118

‎lib/mpl_toolkits/mplot3d/art3d.py

Copy file name to clipboardExpand all lines: lib/mpl_toolkits/mplot3d/art3d.py
+6-7Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def __init__(self, *args, **kwargs):
319319
zs = kwargs.pop('zs', 0)
320320
zdir = kwargs.pop('zdir', 'z')
321321
self._depthshade = kwargs.pop('depthshade', True)
322-
super(self.__class__, self).__init__(*args, **kwargs)
322+
PatchCollection.__init__(self, *args, **kwargs)
323323
self.set_3d_properties(zs, zdir)
324324

325325

@@ -354,7 +354,7 @@ def do_3d_projection(self, renderer):
354354
self._edgecolor3d)
355355
ecs = mcolors.colorConverter.to_rgba_array(ecs, self._alpha)
356356
self.set_edgecolors(ecs)
357-
super(self.__class__, self).set_offsets(list(zip(vxs, vys)))
357+
PatchCollection.set_offsets(self, list(zip(vxs, vys)))
358358

359359
if vzs.size > 0 :
360360
return min(vzs)
@@ -386,11 +386,10 @@ def __init__(self, *args, **kwargs):
386386
zs = kwargs.pop('zs', 0)
387387
zdir = kwargs.pop('zdir', 'z')
388388
self._depthshade = kwargs.pop('depthshade', True)
389-
super(self.__class__, self).__init__(*args, **kwargs)
389+
PathCollection.__init__(self, *args, **kwargs)
390390
self.set_3d_properties(zs, zdir)
391391

392-
393-
def set_sort_zpos(self,val):
392+
def set_sort_zpos(self, val):
394393
'''Set the position to use for z-sorting.'''
395394
self._sort_zpos = val
396395

@@ -421,7 +420,7 @@ def do_3d_projection(self, renderer):
421420
self._edgecolor3d)
422421
ecs = mcolors.colorConverter.to_rgba_array(ecs, self._alpha)
423422
self.set_edgecolors(ecs)
424-
super(self.__class__, self).set_offsets(list(zip(vxs, vys)))
423+
PathCollection.set_offsets(self, list(zip(vxs, vys)))
425424

426425
if vzs.size > 0 :
427426
return min(vzs)
@@ -441,7 +440,7 @@ def patch_collection_2d_to_3d(col, zs=0, zdir='z', depthshade=True):
441440
collection along the *zdir* axis. Defaults to 0.
442441
*zdir* The axis in which to place the patches. Default is "z".
443442
*depthshade* Whether to shade the patches to give a sense of depth.
444-
Defaults to *True*.
443+
Defaults to *True*.
445444
446445
"""
447446
if isinstance(col, PathCollection):

‎setupext.py

Copy file name to clipboardExpand all lines: setupext.py
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,6 +1003,9 @@ class Png(SetupPackage):
10031003
name = "png"
10041004

10051005
def check(self):
1006+
if sys.platform == 'win32':
1007+
return "Unknown version"
1008+
10061009
status, output = getstatusoutput("libpng-config --version")
10071010
if status == 0:
10081011
version = output

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.