moved **kwargs to bottom of constructor signatures // super() -> supe…

…r(className, self)
plotly · May 14, 2018 · f0d863d · f0d863d
1 parent b86d44b
commit f0d863d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/codegen/datatypes.py b/codegen/datatypes.py
@@ -190,7 +190,7 @@ def __init__(self""")
     add_docstring(buffer, node, header=header)
 
     buffer.write(f"""
-        super().__init__('{node.name_property}')
+        super({node.name_base_datatype}, self).__init__('{node.name_property}')
 
         # Import validators
         # -----------------

diff --git a/codegen/figure.py b/codegen/figure.py
@@ -80,7 +80,7 @@ def __init__(self, data=None, layout=None, frames=None):
         frames
             {frames_description}
         \"\"\"
-        super().__init__(data, layout, frames)
+        super({base_classname}, self).__init__(data, layout, frames)
     """)
 
     # ### add_trace methods for each trace type ###

diff --git a/codegen/validators.py b/codegen/validators.py
@@ -54,8 +54,7 @@ def __init__(self, plotly_name={params['plotly_name']},
     # ### Write constructor ###
     buffer.write(f"""
         super({superclass_name}, self).__init__(plotly_name=plotly_name,
-                         parent_name=parent_name,
-                         **kwargs""")
+                         parent_name=parent_name""")
 
     # Write out remaining constructor parameters
     for attr_name, attr_val in params.items():
@@ -66,6 +65,10 @@ def __init__(self, plotly_name={params['plotly_name']},
         buffer.write(f""",
                  {attr_name}={attr_val}""")
 
+    # write **kwargs at the end to make Py2 compatible
+    buffer.write(f""",
+             **kwargs""")
+
     buffer.write(')')
 
     # ### Return buffer's string ###

diff --git a/plotly/basedatatypes.py b/plotly/basedatatypes.py
@@ -28,6 +28,12 @@
 Undefined = object()
 
 
+# back-port of fullmatch from Py3.4+
+def fullmatch(regex, string, flags=0):
+    """Emulate python-3.4 re.fullmatch()."""
+    return re.match("(?:" + regex + r")\Z", string, flags=flags)
+
+
 class BaseFigure(object):
     """
     Base class for all figure types (both widget and non-widget)
@@ -742,7 +748,8 @@ def _str_to_dict_path(key_path_str):
             bracket_re = re.compile('(.*)\[(\d+)\]')
             key_path2 = []
             for key in key_path:
-                match = bracket_re.fullmatch(key)
+                match = fullmatch(bracket_re.pattern, key)
+                #match = bracket_re.fullmatch(key)
                 if match:
                     key_path2.extend(match.groups())
                 else:
@@ -3389,14 +3396,16 @@ def _process_kwargs(self, **kwargs):
         unknown_kwargs = {
             k: v
             for k, v in kwargs.items()
-            if not self._subplotid_prop_re.fullmatch(k)
+            # if not self._subplotid_prop_re.fullmatch(k)
+            if not fullmatch(self._subplotid_prop_re.pattern, k)
         }
         super(BaseLayoutHierarchyType, self)._process_kwargs(**unknown_kwargs)
 
         subplot_kwargs = {
             k: v
             for k, v in kwargs.items()
-            if self._subplotid_prop_re.fullmatch(k)
+            # if self._subplotid_prop_re.fullmatch(k)
+            if fullmatch(self._subplotid_prop_re.pattern, k)
         }
 
         for prop, value in subplot_kwargs.items():
@@ -3416,7 +3425,9 @@ def _set_subplotid_prop(self, prop, value):
         # Get regular expression match
         # ----------------------------
         # Note: we already tested that match exists in the constructor
-        match = self._subplotid_prop_re.fullmatch(prop)
+        # match = self._subplotid_prop_re.fullmatch(prop)
+        match = fullmatch(self._subplotid_prop_re.pattern, prop)
+
         subplot_prop = match.group(1)
         suffix_digit = int(match.group(2))
 
@@ -3477,7 +3488,8 @@ def _strip_subplot_suffix_of_1(self, prop):
         # Handle subplot suffix digit of 1
         # --------------------------------
         # Remove digit of 1 from subplot id (e.g.. xaxis1 -> xaxis)
-        match = self._subplotid_prop_re.fullmatch(prop)
+        # match = self._subplotid_prop_re.fullmatch(prop)
+        match = fullmatch(self._subplotid_prop_re.pattern, prop)
 
         if match:
             subplot_prop = match.group(1)
@@ -3529,7 +3541,8 @@ def __setitem__(self, prop, value):
 
         # Check for subplot assignment
         # ----------------------------
-        match = self._subplotid_prop_re.fullmatch(prop)
+        # match = self._subplotid_prop_re.fullmatch(prop)
+        match = fullmatch(self._subplotid_prop_re.pattern, prop)
         if match is None:
             # Set as ordinary property
             super(BaseLayoutHierarchyType, self).__setitem__(prop, value)
@@ -3543,7 +3556,8 @@ def __setattr__(self, prop, value):
         """
         # Check for subplot assignment
         # ----------------------------
-        match = self._subplotid_prop_re.fullmatch(prop)
+        # match = self._subplotid_prop_re.fullmatch(prop)
+        match = fullmatch(self._subplotid_prop_re.pattern, prop)
         if match is None:
             # Set as ordinary property
             super(BaseLayoutHierarchyType, self).__setattr__(prop, value)
@@ -3565,7 +3579,7 @@ class BaseTraceHierarchyType(BasePlotlyType):
     """
 
     def __init__(self, plotly_name, **kwargs):
-        super(BasePlotlyType, self).__init__(plotly_name, **kwargs)
+        super(BaseTraceHierarchyType, self).__init__(plotly_name, **kwargs)
 
     def _send_prop_set(self, prop_path_str, val):
         if self.parent:

diff --git a/plotly/graph_objs/__init__.py b/plotly/graph_objs/__init__.py
@@ -65,7 +65,6 @@
 from ._frame import Frame
 from ._figure import Figure
 
-
 try:
     import ipywidgets
     from ._figurewidget import FigureWidget