From bd9d9aa015ad70159890a553a77f525d9b385ef6 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sat, 4 Apr 2020 17:14:57 +0530 Subject: [PATCH 01/15] Changed return type of get_{x,y}ticklabels to plain list --- lib/matplotlib/axes/_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index 5d9d4ff712e9..9587ac5f4bc2 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -3420,7 +3420,7 @@ def get_xticklabels(self, minor=False, which=None): See also: `~.pyplot.draw` and `~.FigureCanvasBase.draw`. """ - return self.xaxis.get_ticklabels(minor=minor, which=which) + return list(self.xaxis.get_ticklabels(minor=minor, which=which)) @cbook._make_keyword_only("3.3", "fontdict") def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs): @@ -3814,7 +3814,7 @@ def get_yticklabels(self, minor=False, which=None): See also: `~.pyplot.draw` and `~.FigureCanvasBase.draw`. """ - return self.yaxis.get_ticklabels(minor=minor, which=which) + return list(self.yaxis.get_ticklabels(minor=minor, which=which)) @cbook._make_keyword_only("3.3", "fontdict") def set_yticklabels(self, labels, fontdict=None, minor=False, **kwargs): From 9b7e450ab2ebc138d9e959ad6b0d56ea602547df Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sat, 4 Apr 2020 19:17:34 +0530 Subject: [PATCH 02/15] list typecasting --- lib/matplotlib/axes/_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index 9587ac5f4bc2..7c4964f1f958 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -3406,7 +3406,7 @@ def get_xticklabels(self, minor=False, which=None): which : None, ('minor', 'major', 'both') Overrides *minor*. - Selects which ticklabels to return + Selects which ticklabels to return. Returns ------- From 3906e96171bb35912a3b151e62c481b46a018700 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 00:09:57 +0530 Subject: [PATCH 03/15] Added enhancement changes in behavior.rst --- doc/api/next_api_changes/behaviour.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/api/next_api_changes/behaviour.rst b/doc/api/next_api_changes/behaviour.rst index 9ebe3fe42240..a977595a5977 100644 --- a/doc/api/next_api_changes/behaviour.rst +++ b/doc/api/next_api_changes/behaviour.rst @@ -98,9 +98,9 @@ deprecation warning. `~.Axes.errorbar` now color cycles when only errorbar color is set ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Previously setting the *ecolor* would turn off automatic color cycling for the plot, leading to the -the lines and markers defaulting to whatever the first color in the color cycle was in the case of -multiple plot calls. +Previously setting the *ecolor* would turn off automatic color cycling for the plot, leading to the +the lines and markers defaulting to whatever the first color in the color cycle was in the case of +multiple plot calls. `.rcsetup.validate_color_for_prop_cycle` now always raises TypeError for bytes input ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -155,3 +155,9 @@ support for it will be dropped in a future Matplotlib release. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Previously, keyword arguments were silently ignored when no positional arguments were given. + + +`get_xticklabels` and `get_yticklabels` now returns plain list +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Previously, get_xticklabels and get_yticklabels returns silent_list. +They now return normal list. From 56aaa5036139a182149c64140cf6bf5c02ebb707 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 15:58:27 +0530 Subject: [PATCH 04/15] removed axes --- lib/matplotlib/axes/_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index 7c4964f1f958..5f639f4e889e 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -3420,7 +3420,7 @@ def get_xticklabels(self, minor=False, which=None): See also: `~.pyplot.draw` and `~.FigureCanvasBase.draw`. """ - return list(self.xaxis.get_ticklabels(minor=minor, which=which)) + return self.xaxis.get_ticklabels(minor=minor, which=which) @cbook._make_keyword_only("3.3", "fontdict") def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs): @@ -3814,7 +3814,7 @@ def get_yticklabels(self, minor=False, which=None): See also: `~.pyplot.draw` and `~.FigureCanvasBase.draw`. """ - return list(self.yaxis.get_ticklabels(minor=minor, which=which)) + return self.yaxis.get_ticklabels(minor=minor, which=which) @cbook._make_keyword_only("3.3", "fontdict") def set_yticklabels(self, labels, fontdict=None, minor=False, **kwargs): From d4b33bb2d1a7450c1bebc577d22aa037b4e3f44d Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 16:01:07 +0530 Subject: [PATCH 05/15] changed silent_list to list --- lib/matplotlib/axis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index 832165e85222..28df7d8ab93f 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -1171,14 +1171,14 @@ def get_majorticklabels(self): ticks = self.get_major_ticks() labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()] labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()] - return cbook.silent_list('Text major ticklabel', labels1 + labels2) + return list('Text major ticklabel', labels1 + labels2) def get_minorticklabels(self): """Return a list of Text instances for the minor ticklabels.""" ticks = self.get_minor_ticks() labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()] labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()] - return cbook.silent_list('Text minor ticklabel', labels1 + labels2) + return list('Text minor ticklabel', labels1 + labels2) def get_ticklabels(self, minor=False, which=None): """ From bd102087322a01f181ea3fdd72da92fe9e68a731 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 16:03:56 +0530 Subject: [PATCH 06/15] removed _base.py changes --- lib/matplotlib/axes/_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index 5f639f4e889e..5d9d4ff712e9 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -3406,7 +3406,7 @@ def get_xticklabels(self, minor=False, which=None): which : None, ('minor', 'major', 'both') Overrides *minor*. - Selects which ticklabels to return. + Selects which ticklabels to return Returns ------- From a6c0bf8335f73072f1d92df3bbc4f0b8e4a52846 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 16:27:08 +0530 Subject: [PATCH 07/15] modified doc --- doc/api/next_api_changes/behaviour.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/api/next_api_changes/behaviour.rst b/doc/api/next_api_changes/behaviour.rst index a977595a5977..044a5187a92d 100644 --- a/doc/api/next_api_changes/behaviour.rst +++ b/doc/api/next_api_changes/behaviour.rst @@ -157,7 +157,10 @@ Previously, keyword arguments were silently ignored when no positional arguments were given. -`get_xticklabels` and `get_yticklabels` now returns plain list -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Previously, get_xticklabels and get_yticklabels returns silent_list. -They now return normal list. +`get_minorticklabels` and `get_majorticklabels` now returns plain list +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Previously, get_minorticklabels and get_majorticklabels returns silent_list. +They now return normal list. get_xminorticklabels, get_yminorticklabels, +get_zminorticklabels, get_ticklabels, get_xmajorticklabels, +get_ymajorticklabels and get_zmajorticklabels methods will be affected by this +change. From b26c92aa3db92d9d3fae855c85f9ac7ab9674cca Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 16:32:58 +0530 Subject: [PATCH 08/15] doc changes --- doc/api/next_api_changes/behaviour.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/api/next_api_changes/behaviour.rst b/doc/api/next_api_changes/behaviour.rst index 044a5187a92d..a4d069f3a482 100644 --- a/doc/api/next_api_changes/behaviour.rst +++ b/doc/api/next_api_changes/behaviour.rst @@ -160,7 +160,7 @@ arguments were given. `get_minorticklabels` and `get_majorticklabels` now returns plain list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Previously, get_minorticklabels and get_majorticklabels returns silent_list. -They now return normal list. get_xminorticklabels, get_yminorticklabels, -get_zminorticklabels, get_ticklabels, get_xmajorticklabels, -get_ymajorticklabels and get_zmajorticklabels methods will be affected by this -change. +Their return type is now changed to normal list. `get_xminorticklabels`, +`get_yminorticklabels`, `get_zminorticklabels`, `get_ticklabels`, +`get_xmajorticklabels`, `get_ymajorticklabels` and `get_zmajorticklabels` +methods will be affected by this change. From 3491c721569338e28e76a246b37544c01fa17c80 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 17:14:24 +0530 Subject: [PATCH 09/15] Cross Referencing added --- doc/api/next_api_changes/behaviour.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/api/next_api_changes/behaviour.rst b/doc/api/next_api_changes/behaviour.rst index a4d069f3a482..820b0da5b832 100644 --- a/doc/api/next_api_changes/behaviour.rst +++ b/doc/api/next_api_changes/behaviour.rst @@ -157,10 +157,10 @@ Previously, keyword arguments were silently ignored when no positional arguments were given. -`get_minorticklabels` and `get_majorticklabels` now returns plain list +`.get_minorticklabels` and `.get_majorticklabels` now returns plain list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Previously, get_minorticklabels and get_majorticklabels returns silent_list. -Their return type is now changed to normal list. `get_xminorticklabels`, -`get_yminorticklabels`, `get_zminorticklabels`, `get_ticklabels`, -`get_xmajorticklabels`, `get_ymajorticklabels` and `get_zmajorticklabels` -methods will be affected by this change. +Previously, `.get_minorticklabels` and `.get_majorticklabels` returns +silent_list. Their return type is now changed to normal list. +`.get_xminorticklabels`, `.get_yminorticklabels`, `.get_zminorticklabels`, +`.get_ticklabels`, `.get_xmajorticklabels`, `.get_ymajorticklabels` and +`.get_zmajorticklabels` methods will be affected by this change. From 07b439828ed6f3d65bb96bcb0ab4304201317800 Mon Sep 17 00:00:00 2001 From: Sidharth Date: Sun, 5 Apr 2020 18:46:58 +0530 Subject: [PATCH 10/15] rectified constructor call --- lib/matplotlib/axis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index c7ac3267cc5d..81547c2bc001 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -1171,14 +1171,14 @@ def get_majorticklabels(self): ticks = self.get_major_ticks() labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()] labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()] - return list('Text major ticklabel', labels1 + labels2) + return list(labels1 + labels2) def get_minorticklabels(self): """Return a list of Text instances for the minor ticklabels.""" ticks = self.get_minor_ticks() labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()] labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()] - return list('Text minor ticklabel', labels1 + labels2) + return list(labels1 + labels2) def get_ticklabels(self, minor=False, which=None): """ From f95c76f90798d7b478d9b89dfe6f6acadd33a89e Mon Sep 17 00:00:00 2001 From: Sidharth Date: Tue, 7 Apr 2020 17:08:41 +0530 Subject: [PATCH 11/15] rebased --- lib/matplotlib/axis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index 2c73badc6df7..57adf521f6c7 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -1172,14 +1172,14 @@ def get_majorticklabels(self): ticks = self.get_major_ticks() labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()] labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()] - return list(labels1 + labels2) + return labels1 + labels2 def get_minorticklabels(self): """Return this Axis' minor tick labels, as a list of `~.text.Text`.""" ticks = self.get_minor_ticks() labels1 = [tick.label1 for tick in ticks if tick.label1.get_visible()] labels2 = [tick.label2 for tick in ticks if tick.label2.get_visible()] - return list(labels1 + labels2) + return labels1 + labels2 def get_ticklabels(self, minor=False, which=None): """ From d31f7a2b3f39b9c06d5c79da70e465c3d7c2d285 Mon Sep 17 00:00:00 2001 From: Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com> Date: Wed, 8 Apr 2020 04:52:30 +0530 Subject: [PATCH 12/15] Update doc/api/api_changes_3.3/behaviour.rst Co-Authored-By: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- doc/api/api_changes_3.3/behaviour.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/api_changes_3.3/behaviour.rst b/doc/api/api_changes_3.3/behaviour.rst index 820b0da5b832..1b1952032af8 100644 --- a/doc/api/api_changes_3.3/behaviour.rst +++ b/doc/api/api_changes_3.3/behaviour.rst @@ -159,7 +159,7 @@ arguments were given. `.get_minorticklabels` and `.get_majorticklabels` now returns plain list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Previously, `.get_minorticklabels` and `.get_majorticklabels` returns +Previously, `.Axis.get_minorticklabels` and `.Axis.get_majorticklabels` returns silent_list. Their return type is now changed to normal list. `.get_xminorticklabels`, `.get_yminorticklabels`, `.get_zminorticklabels`, `.get_ticklabels`, `.get_xmajorticklabels`, `.get_ymajorticklabels` and From 005f32fe41a73a20be9356cd71417c234fd099a7 Mon Sep 17 00:00:00 2001 From: Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com> Date: Wed, 8 Apr 2020 04:52:58 +0530 Subject: [PATCH 13/15] Update doc/api/api_changes_3.3/behaviour.rst Co-Authored-By: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- doc/api/api_changes_3.3/behaviour.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/api_changes_3.3/behaviour.rst b/doc/api/api_changes_3.3/behaviour.rst index 1b1952032af8..0718b93bca67 100644 --- a/doc/api/api_changes_3.3/behaviour.rst +++ b/doc/api/api_changes_3.3/behaviour.rst @@ -162,5 +162,5 @@ arguments were given. Previously, `.Axis.get_minorticklabels` and `.Axis.get_majorticklabels` returns silent_list. Their return type is now changed to normal list. `.get_xminorticklabels`, `.get_yminorticklabels`, `.get_zminorticklabels`, -`.get_ticklabels`, `.get_xmajorticklabels`, `.get_ymajorticklabels` and +`.Axis.get_ticklabels`, `.get_xmajorticklabels`, `.get_ymajorticklabels` and `.get_zmajorticklabels` methods will be affected by this change. From 4ff8ddb18ff670c0fe916a912380a7acb87de7a8 Mon Sep 17 00:00:00 2001 From: Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com> Date: Wed, 8 Apr 2020 04:55:38 +0530 Subject: [PATCH 14/15] Update doc/api/api_changes_3.3/behaviour.rst Co-Authored-By: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- doc/api/api_changes_3.3/behaviour.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/api_changes_3.3/behaviour.rst b/doc/api/api_changes_3.3/behaviour.rst index 0718b93bca67..18e2f0a08da1 100644 --- a/doc/api/api_changes_3.3/behaviour.rst +++ b/doc/api/api_changes_3.3/behaviour.rst @@ -158,7 +158,7 @@ arguments were given. `.get_minorticklabels` and `.get_majorticklabels` now returns plain list -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Previously, `.Axis.get_minorticklabels` and `.Axis.get_majorticklabels` returns silent_list. Their return type is now changed to normal list. `.get_xminorticklabels`, `.get_yminorticklabels`, `.get_zminorticklabels`, From 8179b2a633b8d57de9e626de5c89392911df9ba7 Mon Sep 17 00:00:00 2001 From: Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com> Date: Wed, 8 Apr 2020 04:57:13 +0530 Subject: [PATCH 15/15] Sphinx edits --- doc/api/api_changes_3.3/behaviour.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/api/api_changes_3.3/behaviour.rst b/doc/api/api_changes_3.3/behaviour.rst index 18e2f0a08da1..0cf3da87ebd2 100644 --- a/doc/api/api_changes_3.3/behaviour.rst +++ b/doc/api/api_changes_3.3/behaviour.rst @@ -157,8 +157,8 @@ Previously, keyword arguments were silently ignored when no positional arguments were given. -`.get_minorticklabels` and `.get_majorticklabels` now returns plain list -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +`.Axis.get_minorticklabels` and `.Axis.get_majorticklabels` now returns plain list +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Previously, `.Axis.get_minorticklabels` and `.Axis.get_majorticklabels` returns silent_list. Their return type is now changed to normal list. `.get_xminorticklabels`, `.get_yminorticklabels`, `.get_zminorticklabels`,