8000 Reuse axes_grid1's AxisDict in axisartist, instead of duplicating it. · matplotlib/matplotlib@0fd668f · GitHub
[go: up one dir, main page]
Skip to content

Commit 0fd668f

Browse files
anntzeranntzer
committed
Reuse axes_grid1's AxisDict in axisartist, instead of duplicating it.
Also deprecate axisartist's SimpleChainedObjects, which is only used to implement AxisDict (again, axes_grid1 is sufficient). Do the reuse in this direction as axisartist already imports axes_grid1 for other purposes.
1 parent 250c33e commit 0fd668f

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

‎doc/api/next_api_changes/2018-07-17-AL-deprecations.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
API deprecations
2+
````````````````
3+
4+
The following API elements are deprecated:
5+
6+
- ``mpl_toolkits.axisartist.axislines.SimpleChainedObjects``,
7+
``mpl_toolkits.Axes.AxisDict``,

‎lib/mpl_toolkits/axes_grid1/mpl_axes.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ def _init_axis_artists(self, axes=None):
5050
left=SimpleAxisArtist(self.yaxis, 1, self.spines["left"]),
5151
right=SimpleAxisArtist(self.yaxis, 2, self.spines["right"]))
5252

53-
def _get_axislines(self):
53+
@property
54+
def axis(self):
5455
return self._axislines
5556

56-
axis = property(_get_axislines)
57-
5857
def cla(self):
5958
super().cla()
6059
self._init_axis_artists()

‎lib/mpl_toolkits/axisartist/axislines.py

-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@
4545

4646
import numpy as np
4747

48-
from matplotlib import rcParams
48+
from matplotlib import cbook, rcParams
4949
import matplotlib.artist as martist
5050
import matplotlib.axes as maxes
5151
from matplotlib.path import Path
5252
from matplotlib.transforms import Bbox
53+
from mpl_toolkits.axes_grid1 import mpl_axes
5354
from .axisline_style import AxislineStyle
5455
from .axis_artist import AxisArtist, GridlinesCollection
5556

@@ -494,6 +495,7 @@ def get_gridlines(self, which="major", axis="both"):
494495
return gridlines
495496

496497

498+
@cbook.deprecated("3.1")
497499
class SimpleChainedObjects(object):
498500
def __init__(self, objects):
499501
self._objects = objects
@@ -509,6 +511,7 @@ def __call__(self, *kl, **kwargs):
509511

510512
class Axes(maxes.Axes):
511513

514+
@cbook.deprecated("3.1")
512515
class AxisDict(dict):
513516
def __init__(self, axes):
514517
self.axes = axes
@@ -556,7 +559,7 @@ def _init_axis_artists(self, axes=None):
556559
if axes is None:
557560
axes = self
558561

559-
self._axislines = self.AxisDict(self)
562+
self._axislines = mpl_axes.Axes.AxisDict(self)
560563
new_fixed_axis = self.get_grid_helper().new_fixed_axis
561564
for loc in ["bottom", "top", "left", "right"]:
562565
self._axislines[loc] = new_fixed_axis(loc=loc, axes=axes,

0 commit comments

Comments
 (0)
0