8000 Merge remote-tracking branch 'upstream/v1.2.x' · matplotlib/matplotlib@bf7b501 · GitHub
[go: up one dir, main page]
Skip to content

Commit bf7b501

Browse files
mdboommdboom
committed
Merge remote-tracking branch 'upstream/v1.2.x'
Conflicts: lib/matplotlib/nxutils.py
2 parents f262892 + d6c6afd commit bf7b501

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

‎lib/matplotlib/axes.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4669,7 +4669,7 @@ def legend(self, *args, **kwargs):
46694669
*scatterpoints*: integer
46704670
The number of points in the legend for scatter plot
46714671
4672-
*scatteroffsets*: list of floats
4672+
*scatteryoffsets*: list of floats
46734673
a list of yoffsets for scatter symbols in legend
46744674
46754675
*markerscale*: [ *None* | scalar ]
@@ -4941,8 +4941,8 @@ def make_iterable(x):
49414941
if _bottom is None:
49424942
if self.get_yscale() == 'log':
49434943
adjust_ylim = True
4944-
else:
4945-
bottom = [0]
4944+
bottom = [0]
4945+
49464946
nbars = len(left)
49474947
if len(width) == 1:
49484948
width *= nbars
@@ -4956,8 +4956,8 @@ def make_iterable(x):
49564956
if _left is None:
49574957
if self.get_xscale() == 'log':
49584958
adjust_xlim = True
4959-
else:
4960-
left = [0]
4959+
left = [0]
4960+
49614961
nbars = len(bottom)
49624962
if len(left) == 1:
49634963
left *= nbars

‎lib/matplotlib/backends/backend_gtk.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,6 @@ def get_filename_from_user (self):
10991099
filename = self.get_filename()
11001100
break
11011101

1102-
self.hide()
11031102
return filename, self.ext
11041103

11051104
class DialogLineprops:

‎lib/matplotlib/backends/backend_gtk3.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,6 @@ def get_filename_from_user (self):
889889
filename = self.get_filename()
890890
break
891891

892-
self.hide()
893892
return filename, self.ext
894893

895894
class DialogLineprops:

‎lib/matplotlib/figure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ def legend(self, handles, labels, *args, **kwargs):
10961096
*scatterpoints*: integer
10971097
The number of points in the legend line, default is 4
10981098
1099-
*scatteroffsets*: list of floats
1099+
*scatteryoffsets*: list of floats
11001100
a list of yoffsets for scatter symbols in legend
11011101
11021102
*markerscale*: [ *None* | scalar ]

0 commit comments

Comments
 (0)
0