REVERT: Do not expose JoinStyle/CapStyle at all

Author: brunobeltran

lib/matplotlib/backend_bases.py

@@ -821,7 +821,7 @@ def get_antialiased(self):
 
     def get_capstyle(self):
         """Return the `.CapStyle`."""
-        return self._capstyle
+        return self._capstyle.name
 
     def get_clip_rectangle(self):
         """
@@ -866,7 +866,7 @@ def get_forced_alpha(self):
 
     def get_joinstyle(self):
         """Return the `.JoinStyle`."""
-        return self._joinstyle
+        return self._joinstyle.name
 
     def get_linewidth(self):
         """Return the line width in points."""

lib/matplotlib/backends/backend_cairo.py

@@ -32,7 +32,6 @@
 from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
-from matplotlib._types import JoinStyle, CapStyle
 
 
 backend_version = cairo.version
@@ -322,15 +321,15 @@ def points_to_pixels(self, points):
 
 class GraphicsContextCairo(GraphicsContextBase):
     _joind = {
-        JoinStyle.bevel:  cairo.LINE_JOIN_BEVEL,
-        JoinStyle.miter:  cairo.LINE_JOIN_MITER,
-        JoinStyle.round:  cairo.LINE_JOIN_ROUND,
+        'bevel':  cairo.LINE_JOIN_BEVEL,
+        'miter':  cairo.LINE_JOIN_MITER,
+        'round':  cairo.LINE_JOIN_ROUND,
     }
 
     _capd = {
-        CapStyle.butt:        cairo.LINE_CAP_BUTT,
-        CapStyle.projecting:  cairo.LINE_CAP_SQUARE,
-        CapStyle.round:       cairo.LINE_CAP_ROUND,
+        'butt':        cairo.LINE_CAP_BUTT,
+        'projecting':  cairo.LINE_CAP_SQUARE,
+        'round':       cairo.LINE_CAP_ROUND,
     }
 
     def __init__(self, renderer):
@@ -354,8 +353,8 @@ def set_alpha(self, alpha):
         # one for False.
 
     def set_capstyle(self, cs):
-        super().set_capstyle(cs)
-        self.ctx.set_line_cap(self._capd[self.get_capstyle()])
+        self.ctx.set_line_cap(_api.check_getitem(self._capd, capstyle=cs))
+        self._capstyle = cs
 
     def set_clip_rectangle(self, rectangle):
         if not rectangle:
@@ -397,8 +396,8 @@ def get_rgb(self):
         return self.ctx.get_source().get_rgba()[:3]
 
     def set_joinstyle(self, js):
-        super().set_joinstyle(js)
-        self.ctx.set_line_join(self._joind[self.get_joinstyle()])
+        self.ctx.set_line_join(_api.check_getitem(self._joind, joinstyle=js))
+        self._joinstyle = js
 
     def set_linewidth(self, w):
         self._linewidth = float(w)

lib/matplotlib/backends/backend_pdf.py

@@ -26,23 +26,22 @@
 import matplotlib as mpl
 from matplotlib import _api, _text_layout, cbook
 from matplotlib._pylab_helpers import Gcf
-from matplotlib.afm import AFM
 from matplotlib.backend_bases import (
     _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
     GraphicsContextBase, RendererBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
-from matplotlib.dates import UTC
-import matplotlib.dviread as dviread
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont, get_font
+from matplotlib.afm import AFM
+import matplotlib.type1font as type1font
+import matplotlib.dviread as dviread
 from matplotlib.ft2font import (FIXED_WIDTH, ITALIC, LOAD_NO_SCALE,
                                 LOAD_NO_HINTING, KERNING_UNFITTED)
 from matplotlib.mathtext import MathTextParser
-from matplotlib import _path
-from matplotlib.path import Path
-from matplotlib._types import JoinStyle, CapStyle
-import matplotlib.type1font as type1font
 from matplotlib.transforms import Affine2D, BboxBase
+from matplotlib.path import Path
+from matplotlib.dates import UTC
+from matplotlib import _path
 from . import _backend_pdf_ps
 
 _log = logging.getLogger(__name__)
@@ -747,8 +746,7 @@ def newPage(self, width, height):
                          self.reserveObject('length of content stream'))
         # Initialize the pdf graphics state to match the default mpl
         # graphics context: currently only the join style needs to be set
-        self.output(GraphicsContextPdf.joinstyles[JoinStyle.round],
-                    Op.setlinejoin)
+        self.output(GraphicsContextPdf.joinstyles['round'], Op.setlinejoin)
 
         # Clear the list of annotations for the next page
         self.pageAnnotations = []
@@ -2416,8 +2414,8 @@ def paint(self):
         """
         return Op.paint_path(self.fill(), self.stroke())
 
-    capstyles = {CapStyle.butt: 0, CapStyle.round: 1, CapStyle.projecting: 2}
-    joinstyles = {JoinStyle.miter: 0, JoinStyle.round: 1, JoinStyle.bevel: 2}
+    capstyles = {'butt': 0, 'round': 1, 'projecting': 2}
+    joinstyles = {'miter': 0, 'round': 1, 'bevel': 2}
 
     def capstyle_cmd(self, style):
         return [self.capstyles[style], Op.setlinecap]

lib/matplotlib/backends/backend_pgf.py

@@ -26,7 +26,6 @@
 from matplotlib.path import Path
 from matplotlib.figure import Figure
 from matplotlib._pylab_helpers import Gcf
-from matplotlib._types import JoinStyle, CapStyle
 
 _log = logging.getLogger(__name__)
 
@@ -516,15 +515,15 @@ def _print_pgf_clip(self, gc):
 
     def _print_pgf_path_styles(self, gc, rgbFace):
         # cap style
-        capstyles = {CapStyle.butt: r"\pgfsetbuttcap",
-                     CapStyle.round: r"\pgfsetroundcap",
-                     CapStyle.projecting: r"\pgfsetrectcap"}
+        capstyles = {"butt": r"\pgfsetbuttcap",
+                     "round": r"\pgfsetroundcap",
+                     "projecting": r"\pgfsetrectcap"}
         writeln(self.fh, capstyles[gc.get_capstyle()])
 
         # join style
-        joinstyles = {JoinStyle.miter: r"\pgfsetmiterjoin",
-                      JoinStyle.round: r"\pgfsetroundjoin",
-                      JoinStyle.bevel: r"\pgfsetbeveljoin"}
+        joinstyles = {"miter": r"\pgfsetmiterjoin",
+                      "round": r"\pgfsetroundjoin",
+                      "bevel": r"\pgfsetbeveljoin"}
         writeln(self.fh, joinstyles[gc.get_joinstyle()])
 
         # filling

lib/matplotlib/backends/backend_ps.py

@@ -24,17 +24,16 @@
 from matplotlib.backend_bases import (
     _Backend, _check_savefig_extra_args, FigureCanvasBase, FigureManagerBase,
     GraphicsContextBase, RendererBase)
-from matplotlib.backends.backend_mixed import MixedModeRenderer
 from matplotlib.cbook import is_writable_file_like, file_requires_unicode
 from matplotlib.font_manager import get_font
 from matplotlib.ft2font import LOAD_NO_HINTING, LOAD_NO_SCALE
 from matplotlib._ttconv import convert_ttf_to_ps
 from matplotlib.mathtext import MathTextParser
 from matplotlib._mathtext_data import uni2type1
 from matplotlib.path import Path
-from matplotlib._types import JoinStyle, CapStyle
 from matplotlib.texmanager import TexManager
 from matplotlib.transforms import Affine2D
+from matplotlib.backends.backend_mixed import MixedModeRenderer
 from . import _backend_pdf_ps
 
 _log = logging.getLogger(__name__)
@@ -802,16 +801,11 @@ def _is_transparent(rgb_or_rgba):
 
 @_api.deprecated("3.4", alternative="GraphicsContextBase")
 class GraphicsContextPS(GraphicsContextBase):
-
-    _capstyles = {CapStyle.butt: 0, CapStyle.round: 1, CapStyle.projecting: 2}
-
     def get_capstyle(self):
-        return self._capstyles[super().get_capstyle()]
-
-    _joinstyles = {JoinStyle.miter: 0, JoinStyle.round: 1, JoinStyle.bevel: 2}
+        return {'butt': 0, 'round': 1, 'projecting': 2}[super().get_capstyle()]
 
     def get_joinstyle(self):
-        return self._joinstyles[super().get_joinstyle()]
+        return {'miter': 0, 'round': 1, 'bevel': 2}[super().get_joinstyle()]
 
 
 class _Orientation(Enum):

lib/matplotlib/backends/backend_svg.py

@@ -27,7 +27,6 @@
 from matplotlib.path import Path
 from matplotlib import _path
 from matplotlib.transforms import Affine2D, Affine2DBase
-from matplotlib._types import JoinStyle, CapStyle
 
 _log = logging.getLogger(__name__)
 
@@ -572,10 +571,10 @@ def _get_style_dict(self, gc, rgbFace):
                 attrib['stroke-opacity'] = short_float_fmt(rgb[3])
             if linewidth != 1.0:
                 attrib['stroke-width'] = short_float_fmt(linewidth)
-            if gc.get_joinstyle() != JoinStyle.round:
-                attrib['stroke-linejoin'] = gc.get_joinstyle().name
-            if gc.get_capstyle() != CapStyle.butt:
-                attrib['stroke-linecap'] = _capstyle_d[gc.get_capstyle().name]
+            if gc.get_joinstyle() != 'round':
+                attrib['stroke-linejoin'] = gc.get_joinstyle()
+            if gc.get_capstyle() != 'butt':
+                attrib['stroke-linecap'] = _capstyle_d[gc.get_capstyle()]
 
         return attrib
 

lib/matplotlib/backends/backend_wx.py

@@ -28,7 +28,6 @@
 from matplotlib.figure import Figure
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
-from matplotlib._types import JoinStyle, CapStyle
 from matplotlib.widgets import SubplotTool
 
 import wx
@@ -327,13 +326,13 @@ class GraphicsContextWx(GraphicsContextBase):
     since wxPython colour management is rather simple, I have not chosen
     to implement a separate colour manager class.
     """
-    _capd = {CapStyle.butt: wx.CAP_BUTT,
-             CapStyle.projecting: wx.CAP_PROJECTING,
-             CapStyle.round: wx.CAP_ROUND}
+    _capd = {'butt': wx.CAP_BUTT,
+             'projecting': wx.CAP_PROJECTING,
+             'round': wx.CAP_ROUND}
 
-    _joind = {JoinStyle.bevel: wx.JOIN_BEVEL,
-              JoinStyle.miter: wx.JOIN_MITER,
-              JoinStyle.round: wx.JOIN_ROUND}
+    _joind = {'bevel': wx.JOIN_BEVEL,
+              'miter': wx.JOIN_MITER,
+              'round': wx.JOIN_ROUND}
 
     _cache = weakref.WeakKeyDictionary()
 

lib/matplotlib/collections.py

@@ -659,12 +659,11 @@ def set_capstyle(self, cs):
         Parameters
         ----------
         cs : `.CapStyle` or {'butt', 'round', 'projecting'}
-            The capstyle.
         """
         self._capstyle = CapStyle(cs)
 
     def get_capstyle(self):
-        return self._capstyle
+        return self._capstyle.name
 
     def set_joinstyle(self, js):
         """
@@ -673,12 +672,11 @@ def set_joinstyle(self, js):
         Parameters
         ----------
         js : `.JoinStyle` or {'miter', 'round', 'bevel'}
-            The joinstyle.
         """
         self._joinstyle = JoinStyle(js)
 
     def get_joinstyle(self):
-        return self._joinstyle
+        return self._joinstyle.name
 
     @staticmethod
     def _bcast_lwls(linewidths, dashes):

lib/matplotlib/lines.py

@@ -254,12 +254,12 @@ class Line2D(Artist):
     @_api.deprecated("3.4")
     @_api.classproperty
     def validCap(cls):
-        return ('butt', 'round', 'projecting')
+        return tuple(cs.value for cs in CapStyle)
 
     @_api.deprecated("3.4")
     @_api.classproperty
     def validJoin(cls):
-        return ('miter', 'round', 'bevel')
+        return tuple(js.value for js in JoinStyle)
 
     def __str__(self):
         if self._label != "":
@@ -1344,15 +1344,15 @@ def get_dash_joinstyle(self):
 
         See also `~.Line2D.set_dash_joinstyle`.
         """
-        return self._dashjoinstyle
+        return self._dashjoinstyle.name
 
     def get_solid_joinstyle(self):
         """
         Return the `.JoinStyle` for solid lines.
 
         See also `~.Line2D.set_solid_joinstyle`.
         """
-        return self._solidjoinstyle
+        return self._solidjoinstyle.name
 
     def set_dash_capstyle(self, s):
         """
@@ -1386,15 +1386,15 @@ def get_dash_capstyle(self):
 
         See also `~.Line2D.set_dash_capstyle`.
         """
-        return self._dashcapstyle
+        return self._dashcapstyle.name
 
     def get_solid_capstyle(self):
         """
         Return the `.CapStyle` for solid lines.
 
         See also `~.Line2D.set_solid_capstyle`.
         """
-        return self._solidcapstyle
+        return self._solidcapstyle.name
 
     def is_dashed(self):
         """

lib/matplotlib/tests/test_collections.py

@@ -6,11 +6,12 @@
 import pytest
 
 import matplotlib as mpl
+import matplotlib.pyplot as plt
 import matplotlib.collections as mcollections
+import matplotlib.transforms as mtransforms
 from matplotlib.collections import (Collection, LineCollection,
                                     EventCollection, PolyCollection)
 import matplotlib.pyplot as plt
-from matplotlib._types import JoinStyle, CapStyle
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
 import matplotlib.transforms as mtransforms
 
@@ -530,17 +531,17 @@ def test_lslw_bcast():
 @pytest.mark.style('default')
 def test_capstyle():
     col = mcollections.PathCollection([], capstyle='round')
-    assert col.get_capstyle() == CapStyle.round
+    assert col.get_capstyle() == 'round'
     col.set_capstyle('butt')
-    assert col.get_capstyle() == CapStyle.butt
+    assert col.get_capstyle() == 'butt'
 
 
 @pytest.mark.style('default')
 def test_joinstyle():
     col = mcollections.PathCollection([], joinstyle='round')
-    assert col.get_joinstyle() == JoinStyle.round
+    assert col.get_joinstyle() == 'round'
     col.set_joinstyle('miter')
-    assert col.get_joinstyle() == JoinStyle.miter
+    assert col.get_joinstyle() == 'miter'
 
 
 @image_comparison(['cap_and_joinstyle.png'])