Fix error for graph object properties named v (like in the cone trace) (#1060)

There was a variable name conflict in the code generated in the constructor of each trace.
See #1051

Author: jonmmease

codegen/datatypes.py

@@ -241,8 +241,8 @@ def __init__(self""")
     for subtype_node in subtype_nodes:
         name_prop = subtype_node.name_property
         buffer.write(f"""
-        v = arg.pop('{name_prop}', None)
-        self.{name_prop} = {name_prop} if {name_prop} is not None else v""")
+        _v = arg.pop('{name_prop}', None)
+        self.{name_prop} = {name_prop} if {name_prop} is not None else _v""")
 
     # ### Literals ###
     if literal_nodes:

plotly/graph_objs/_area.py

@@ -739,46 +739,46 @@ def __init__(
 
         # Populate data dict with properties
         # ----------------------------------
-        v = arg.pop('customdata', None)
-        self.customdata = customdata if customdata is not None else v
-        v = arg.pop('customdatasrc', None)
-        self.customdatasrc = customdatasrc if customdatasrc is not None else v
-        v = arg.pop('hoverinfo', None)
-        self.hoverinfo = hoverinfo if hoverinfo is not None else v
-        v = arg.pop('hoverinfosrc', None)
-        self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else v
-        v = arg.pop('hoverlabel', None)
-        self.hoverlabel = hoverlabel if hoverlabel is not None else v
-        v = arg.pop('ids', None)
-        self.ids = ids if ids is not None else v
-        v = arg.pop('idssrc', None)
-        self.idssrc = idssrc if idssrc is not None else v
-        v = arg.pop('legendgroup', None)
-        self.legendgroup = legendgroup if legendgroup is not None else v
-        v = arg.pop('marker', None)
-        self.marker = marker if marker is not None else v
-        v = arg.pop('name', None)
-        self.name = name if name is not None else v
-        v = arg.pop('opacity', None)
-        self.opacity = opacity if opacity is not None else v
-        v = arg.pop('r', None)
-        self.r = r if r is not None else v
-        v = arg.pop('rsrc', None)
-        self.rsrc = rsrc if rsrc is not None else v
-        v = arg.pop('selectedpoints', None)
-        self.selectedpoints = selectedpoints if selectedpoints is not None else v
-        v = arg.pop('showlegend', None)
-        self.showlegend = showlegend if showlegend is not None else v
-        v = arg.pop('stream', None)
-        self.stream = stream if stream is not None else v
-        v = arg.pop('t', None)
-        self.t = t if t is not None else v
-        v = arg.pop('tsrc', None)
-        self.tsrc = tsrc if tsrc is not None else v
-        v = arg.pop('uid', None)
-        self.uid = uid if uid is not None else v
-        v = arg.pop('visible', None)
-        self.visible = visible if visible is not None else v
+        _v = arg.pop('customdata', None)
+        self.customdata = customdata if customdata is not None else _v
+        _v = arg.pop('customdatasrc', None)
+        self.customdatasrc = customdatasrc if customdatasrc is not None else _v
+        _v = arg.pop('hoverinfo', None)
+        self.hoverinfo = hoverinfo if hoverinfo is not None else _v
+        _v = arg.pop('hoverinfosrc', None)
+        self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else _v
+        _v = arg.pop('hoverlabel', None)
+        self.hoverlabel = hoverlabel if hoverlabel is not None else _v
+        _v = arg.pop('ids', None)
+        self.ids = ids if ids is not None else _v
+        _v = arg.pop('idssrc', None)
+        self.idssrc = idssrc if idssrc is not None else _v
+        _v = arg.pop('legendgroup', None)
+        self.legendgroup = legendgroup if legendgroup is not None else _v
+        _v = arg.pop('marker', None)
+        self.marker = marker if marker is not None else _v
+        _v = arg.pop('name', None)
+        self.name = name if name is not None else _v
+        _v = arg.pop('opacity', None)
+        self.opacity = opacity if opacity is not None else _v
+        _v = arg.pop('r', None)
+        self.r = r if r is not None else _v
+        _v = arg.pop('rsrc', None)
+        self.rsrc = rsrc if rsrc is not None else _v
+        _v = arg.pop('selectedpoints', None)
+        self.selectedpoints = selectedpoints if selectedpoints is not None else _v
+        _v = arg.pop('showlegend', None)
+        self.showlegend = showlegend if showlegend is not None else _v
+        _v = arg.pop('stream', None)
+        self.stream = stream if stream is not None else _v
+        _v = arg.pop('t', None)
+        self.t = t if t is not None else _v
+        _v = arg.pop('tsrc', None)
+        self.tsrc = tsrc if tsrc is not None else _v
+        _v = arg.pop('uid', None)
+        self.uid = uid if uid is not None else _v
+        _v = arg.pop('visible', None)
+        self.visible = visible if visible is not None else _v
 
         # Read-only literals
         # ------------------

plotly/graph_objs/_bar.py

@@ -2058,114 +2058,114 @@ def __init__(
 
         # Populate data dict with properties
         # ----------------------------------
-        v = arg.pop('base', None)
-        self.base = base if base is not None else v
-        v = arg.pop('basesrc', None)
-        self.basesrc = basesrc if basesrc is not None else v
-        v = arg.pop('cliponaxis', None)
-        self.cliponaxis = cliponaxis if cliponaxis is not None else v
-        v = arg.pop('constraintext', None)
-        self.constraintext = constraintext if constraintext is not None else v
-        v = arg.pop('customdata', None)
-        self.customdata = customdata if customdata is not None else v
-        v = arg.pop('customdatasrc', None)
-        self.customdatasrc = customdatasrc if customdatasrc is not None else v
-        v = arg.pop('dx', None)
-        self.dx = dx if dx is not None else v
-        v = arg.pop('dy', None)
-        self.dy = dy if dy is not None else v
-        v = arg.pop('error_x', None)
-        self.error_x = error_x if error_x is not None else v
-        v = arg.pop('error_y', None)
-        self.error_y = error_y if error_y is not None else v
-        v = arg.pop('hoverinfo', None)
-        self.hoverinfo = hoverinfo if hoverinfo is not None else v
-        v = arg.pop('hoverinfosrc', None)
-        self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else v
-        v = arg.pop('hoverlabel', None)
-        self.hoverlabel = hoverlabel if hoverlabel is not None else v
-        v = arg.pop('hovertext', None)
-        self.hovertext = hovertext if hovertext is not None else v
-        v = arg.pop('hovertextsrc', None)
-        self.hovertextsrc = hovertextsrc if hovertextsrc is not None else v
-        v = arg.pop('ids', None)
-        self.ids = ids if ids is not None else v
-        v = arg.pop('idssrc', None)
-        self.idssrc = idssrc if idssrc is not None else v
-        v = arg.pop('insidetextfont', None)
-        self.insidetextfont = insidetextfont if insidetextfont is not None else v
-        v = arg.pop('legendgroup', None)
-        self.legendgroup = legendgroup if legendgroup is not None else v
-        v = arg.pop('marker', None)
-        self.marker = marker if marker is not None else v
-        v = arg.pop('name', None)
-        self.name = name if name is not None else v
-        v = arg.pop('offset', None)
-        self.offset = offset if offset is not None else v
-        v = arg.pop('offsetsrc', None)
-        self.offsetsrc = offsetsrc if offsetsrc is not None else v
-        v = arg.pop('opacity', None)
-        self.opacity = opacity if opacity is not None else v
-        v = arg.pop('orientation', None)
-        self.orientation = orientation if orientation is not None else v
-        v = arg.pop('outsidetextfont', None)
-        self.outsidetextfont = outsidetextfont if outsidetextfont is not None else v
-        v = arg.pop('r', None)
-        self.r = r if r is not None else v
-        v = arg.pop('rsrc', None)
-        self.rsrc = rsrc if rsrc is not None else v
-        v = arg.pop('selected', None)
-        self.selected = selected if selected is not None else v
-        v = arg.pop('selectedpoints', None)
-        self.selectedpoints = selectedpoints if selectedpoints is not None else v
-        v = arg.pop('showlegend', None)
-        self.showlegend = showlegend if showlegend is not None else v
-        v = arg.pop('stream', None)
-        self.stream = stream if stream is not None else v
-        v = arg.pop('t', None)
-        self.t = t if t is not None else v
-        v = arg.pop('text', None)
-        self.text = text if text is not None else v
-        v = arg.pop('textfont', None)
-        self.textfont = textfont if textfont is not None else v
-        v = arg.pop('textposition', None)
-        self.textposition = textposition if textposition is not None else v
-        v = arg.pop('textpositionsrc', None)
-        self.textpositionsrc = textpositionsrc if textpositionsrc is not None else v
-        v = arg.pop('textsrc', None)
-        self.textsrc = textsrc if textsrc is not None else v
-        v = arg.pop('tsrc', None)
-        self.tsrc = tsrc if tsrc is not None else v
-        v = arg.pop('uid', None)
-        self.uid = uid if uid is not None else v
-        v = arg.pop('unselected', None)
-        self.unselected = unselected if unselected is not None else v
-        v = arg.pop('visible', None)
-        self.visible = visible if visible is not None else v
-        v = arg.pop('width', None)
-        self.width = width if width is not None else v
-        v = arg.pop('widthsrc', None)
-        self.widthsrc = widthsrc if widthsrc is not None else v
-        v = arg.pop('x', None)
-        self.x = x if x is not None else v
-        v = arg.pop('x0', None)
-        self.x0 = x0 if x0 is not None else v
-        v = arg.pop('xaxis', None)
-        self.xaxis = xaxis if xaxis is not None else v
-        v = arg.pop('xcalendar', None)
-        self.xcalendar = xcalendar if xcalendar is not None else v
-        v = arg.pop('xsrc', None)
-        self.xsrc = xsrc if xsrc is not None else v
-        v = arg.pop('y', None)
-        self.y = y if y is not None else v
-        v = arg.pop('y0', None)
-        self.y0 = y0 if y0 is not None else v
-        v = arg.pop('yaxis', None)
-        self.yaxis = yaxis if yaxis is not None else v
-        v = arg.pop('ycalendar', None)
-        self.ycalendar = ycalendar if ycalendar is not None else v
-        v = arg.pop('ysrc', None)
-        self.ysrc = ysrc if ysrc is not None else v
+        _v = arg.pop('base', None)
+        self.base = base if base is not None else _v
+        _v = arg.pop('basesrc', None)
+        self.basesrc = basesrc if basesrc is not None else _v
+        _v = arg.pop('cliponaxis', None)
+        self.cliponaxis = cliponaxis if cliponaxis is not None else _v
+        _v = arg.pop('constraintext', None)
+        self.constraintext = constraintext if constraintext is not None else _v
+        _v = arg.pop('customdata', None)
+        self.customdata = customdata if customdata is not None else _v
+        _v = arg.pop('customdatasrc', None)
+        self.customdatasrc = customdatasrc if customdatasrc is not None else _v
+        _v = arg.pop('dx', None)
+        self.dx = dx if dx is not None else _v
+        _v = arg.pop('dy', None)
+        self.dy = dy if dy is not None else _v
+        _v = arg.pop('error_x', None)
+        self.error_x = error_x if error_x is not None else _v
+        _v = arg.pop('error_y', None)
+        self.error_y = error_y if error_y is not None else _v
+        _v = arg.pop('hoverinfo', None)
+        self.hoverinfo = hoverinfo if hoverinfo is not None else _v
+        _v = arg.pop('hoverinfosrc', None)
+        self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else _v
+        _v = arg.pop('hoverlabel', None)
+        self.hoverlabel = hoverlabel if hoverlabel is not None else _v
+        _v = arg.pop('hovertext', None)
+        self.hovertext = hovertext if hovertext is not None else _v
+        _v = arg.pop('hovertextsrc', None)
+        self.hovertextsrc = hovertextsrc if hovertextsrc is not None else _v
+        _v = arg.pop('ids', None)
+        self.ids = ids if ids is not None else _v
+        _v = arg.pop('idssrc', None)
+        self.idssrc = idssrc if idssrc is not None else _v
+        _v = arg.pop('insidetextfont', None)
+        self.insidetextfont = insidetextfont if insidetextfont is not None else _v
+        _v = arg.pop('legendgroup', None)
+        self.legendgroup = legendgroup if legendgroup is not None else _v
+        _v = arg.pop('marker', None)
+        self.marker = marker if marker is not None else _v
+        _v = arg.pop('name', None)
+        self.name = name if name is not None else _v
+        _v = arg.pop('offset', None)
+        self.offset = offset if offset is not None else _v
+        _v = arg.pop('offsetsrc', None)
+        self.offsetsrc = offsetsrc if offsetsrc is not None else _v
+        _v = arg.pop('opacity', None)
+        self.opacity = opacity if opacity is not None else _v
+        _v = arg.pop('orientation', None)
+        self.orientation = orientation if orientation is not None else _v
+        _v = arg.pop('outsidetextfont', None)
+        self.outsidetextfont = outsidetextfont if outsidetextfont is not None else _v
+        _v = arg.pop('r', None)
+        self.r = r if r is not None else _v
+        _v = arg.pop('rsrc', None)
+        self.rsrc = rsrc if rsrc is not None else _v
+        _v = arg.pop('selected', None)
+        self.selected = selected if selected is not None else _v
+        _v = arg.pop('selectedpoints', None)
+        self.selectedpoints = selectedpoints if selectedpoints is not None else _v
+        _v = arg.pop('showlegend', None)
+        self.showlegend = showlegend if showlegend is not None else _v
+        _v = arg.pop('stream', None)
+        self.stream = stream if stream is not None else _v
+        _v = arg.pop('t', None)
+        self.t = t if t is not None else _v
+        _v = arg.pop('text', None)
+        self.text = text if text is not None else _v
+        _v = arg.pop('textfont', None)
+        self.textfont = textfont if textfont is not None else _v
+        _v = arg.pop('textposition', None)
+        self.textposition = textposition if textposition is not None else _v
+        _v = arg.pop('textpositionsrc', None)
+        self.textpositionsrc = textpositionsrc if textpositionsrc is not None else _v
+        _v = arg.pop('textsrc', None)
+        self.textsrc = textsrc if textsrc is not None else _v
+        _v = arg.pop('tsrc', None)
+        self.tsrc = tsrc if tsrc is not None else _v
+        _v = arg.pop('uid', None)
+        self.uid = uid if uid is not None else _v
+        _v = arg.pop('unselected', None)
+        self.unselected = unselected if unselected is not None else _v
+        _v = arg.pop('visible', None)
+        self.visible = visible if visible is not None else _v
+        _v = arg.pop('width', None)
+        self.width = width if width is not None else _v
+        _v = arg.pop('widthsrc', None)
+        self.widthsrc = widthsrc if widthsrc is not None else _v
+        _v = arg.pop('x', None)
+        self.x = x if x is not None else _v
+        _v = arg.pop('x0', None)
+        self.x0 = x0 if x0 is not None else _v
+        _v = arg.pop('xaxis', None)
+        self.xaxis = xaxis if xaxis is not None else _v
+        _v = arg.pop('xcalendar', None)
+        self.xcalendar = xcalendar if xcalendar is not None else _v
+        _v = arg.pop('xsrc', None)
+        self.xsrc = xsrc if xsrc is not None else _v
+        _v = arg.pop('y', None)
+        self.y = y if y is not None else _v
+        _v = arg.pop('y0', None)
+        self.y0 = y0 if y0 is not None else _v
+        _v = arg.pop('yaxis', None)
+        self.yaxis = yaxis if yaxis is not None else _v
+        _v = arg.pop('ycalendar', None)
+        self.ycalendar = ycalendar if ycalendar is not None else _v
+        _v = arg.pop('ysrc', None)
+        self.ysrc = ysrc if ysrc is not None else _v
 
         # Read-only literals
         # ------------------