Make all arguments to Collection and most to subclasses keyword only

Author: oscargus

lib/matplotlib/collections.py

@@ -75,8 +75,7 @@ class Collection(artist.Artist, cm.ScalarMappable):
     _edge_default = False
 
     @_docstring.interpd
-    @_api.make_keyword_only("3.6", name="edgecolors")
-    def __init__(self,
+    def __init__(self, *,
                  edgecolors=None,
                  facecolors=None,
                  linewidths=None,
@@ -91,7 +90,6 @@ def __init__(self,
                  pickradius=5.0,
                  hatch=None,
                  urls=None,
-                 *,
                  zorder=1,
                  **kwargs
                  ):
@@ -1163,8 +1161,7 @@ def legend_elements(self, prop="colors", num="auto",
 
 class PolyCollection(_CollectionWithSizes):
 
-    @_api.make_keyword_only("3.6", name="closed")
-    def __init__(self, verts, sizes=None, closed=True, **kwargs):
+    def __init__(self, verts, sizes=None, *, closed=True, **kwargs):
         """
         Parameters
         ----------
@@ -1294,9 +1291,9 @@ class RegularPolyCollection(_CollectionWithSizes):
     _path_generator = mpath.Path.unit_regular_polygon
     _factor = np.pi ** (-1/2)
 
-    @_api.make_keyword_only("3.6", name="rotation")
     def __init__(self,
                  numsides,
+                 *,
                  rotation=0,
                  sizes=(1,),
                  **kwargs):
@@ -1560,10 +1557,10 @@ class EventCollection(LineCollection):
 
     _edge_default = True
 
-    @_api.make_keyword_only("3.6", name="lineoffset")
     def __init__(self,
                  positions,  # Cannot be None.
                  orientation='horizontal',
+                 *,
                  lineoffset=0,
                  linelength=1,
                  linewidth=None,
@@ -1756,8 +1753,7 @@ def __init__(self, sizes, **kwargs):
 class EllipseCollection(Collection):
     """A collection of ellipses, drawn using splines."""
 
-    @_api.make_keyword_only("3.6", name="units")
-    def __init__(self, widths, heights, angles, units='points', **kwargs):
+    def __init__(self, widths, heights, angles, *, units='points', **kwargs):
         """
         Parameters
         ----------
@@ -1844,8 +1840,7 @@ class PatchCollection(Collection):
     collection of patches.
     """
 
-    @_api.make_keyword_only("3.6", name="match_original")
-    def __init__(self, patches, match_original=False, **kwargs):
+    def __init__(self, patches, *, match_original=False, **kwargs):
         """
         Parameters
         ----------