Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 43105ce

Browse filesBrowse files
jonmmeasejonmmease
authored
Fix error for graph object properties named v (like in the cone trace) (plotly#1060)
There was a variable name conflict in the code generated in the constructor of each trace. See plotly#1051
1 parent 0a36c9d commit 43105ce
Copy full SHA for 43105ce

File tree

Expand file treeCollapse file tree

559 files changed

+10462
-10462
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

559 files changed

+10462
-10462
lines changed

‎codegen/datatypes.py

Copy file name to clipboardExpand all lines: codegen/datatypes.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ def __init__(self""")
241241
for subtype_node in subtype_nodes:
242242
name_prop = subtype_node.name_property
243243
buffer.write(f"""
244-
v = arg.pop('{name_prop}', None)
245-
self.{name_prop} = {name_prop} if {name_prop} is not None else v""")
244+
_v = arg.pop('{name_prop}', None)
245+
self.{name_prop} = {name_prop} if {name_prop} is not None else _v""")
246246

247247
# ### Literals ###
248248
if literal_nodes:

‎plotly/graph_objs/_area.py

Copy file name to clipboardExpand all lines: plotly/graph_objs/_area.py
+40-40Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -739,46 +739,46 @@ def __init__(
739739

740740
# Populate data dict with properties
741741
# ----------------------------------
742-
v = arg.pop('customdata', None)
743-
self.customdata = customdata if customdata is not None else v
744-
v = arg.pop('customdatasrc', None)
745-
self.customdatasrc = customdatasrc if customdatasrc is not None else v
746-
v = arg.pop('hoverinfo', None)
747-
self.hoverinfo = hoverinfo if hoverinfo is not None else v
748-
v = arg.pop('hoverinfosrc', None)
749-
self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else v
750-
v = arg.pop('hoverlabel', None)
751-
self.hoverlabel = hoverlabel if hoverlabel is not None else v
752-
v = arg.pop('ids', None)
753-
self.ids = ids if ids is not None else v
754-
v = arg.pop('idssrc', None)
755-
self.idssrc = idssrc if idssrc is not None else v
756-
v = arg.pop('legendgroup', None)
757-
self.legendgroup = legendgroup if legendgroup is not None else v
758-
v = arg.pop('marker', None)
759-
self.marker = marker if marker is not None else v
760-
v = arg.pop('name', None)
761-
self.name = name if name is not None else v
762-
v = arg.pop('opacity', None)
763-
self.opacity = opacity if opacity is not None else v
764-
v = arg.pop('r', None)
765-
self.r = r if r is not None else v
766-
v = arg.pop('rsrc', None)
767-
self.rsrc = rsrc if rsrc is not None else v
768-
v = arg.pop('selectedpoints', None)
769-
self.selectedpoints = selectedpoints if selectedpoints is not None else v
770-
v = arg.pop('showlegend', None)
771-
self.showlegend = showlegend if showlegend is not None else v
772-
v = arg.pop('stream', None)
773-
self.stream = stream if stream is not None else v
774-
v = arg.pop('t', None)
775-
self.t = t if t is not None else v
776-
v = arg.pop('tsrc', None)
777-
self.tsrc = tsrc if tsrc is not None else v
778-
v = arg.pop('uid', None)
779-
self.uid = uid if uid is not None else v
780-
v = arg.pop('visible', None)
781-
self.visible = visible if visible is not None else v
742+
_v = arg.pop('customdata', None)
743+
self.customdata = customdata if customdata is not None else _v
744+
_v = arg.pop('customdatasrc', None)
745+
self.customdatasrc = customdatasrc if customdatasrc is not None else _v
746+
_v = arg.pop('hoverinfo', None)
747+
self.hoverinfo = hoverinfo if hoverinfo is not None else _v
748+
_v = arg.pop('hoverinfosrc', None)
749+
self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else _v
750+
_v = arg.pop('hoverlabel', None)
751+
self.hoverlabel = hoverlabel if hoverlabel is not None else _v
752+
_v = arg.pop('ids', None)
753+
self.ids = ids if ids is not None else _v
754+
_v = arg.pop('idssrc', None)
755+
self.idssrc = idssrc if idssrc is not None else _v
756+
_v = arg.pop('legendgroup', None)
757+
self.legendgroup = legendgroup if legendgroup is not None else _v
758+
_v = arg.pop('marker', None)
759+
self.marker = marker if marker is not None else _v
760+
_v = arg.pop('name', None)
761+
self.name = name if name is not None else _v
762+
_v = arg.pop('opacity', None)
763+
self.opacity = opacity if opacity is not None else _v
764+
_v = arg.pop('r', None)
765+
self.r = r if r is not None else _v
766+
_v = arg.pop('rsrc', None)
767+
self.rsrc = rsrc if rsrc is not None else _v
768+
_v = arg.pop('selectedpoints', None)
769+
self.selectedpoints = selectedpoints if selectedpoints is not None else _v
770+
_v = arg.pop('showlegend', None)
771+
self.showlegend = showlegend if showlegend is not None else _v
772+
_v = arg.pop('stream', None)
773+
self.stream = stream if stream is not None else _v
774+
_v = arg.pop('t', None)
775+
self.t = t if t is not None else _v
776+
_v = arg.pop('tsrc', None)
777+
self.tsrc = tsrc if tsrc is not None else _v
778+
_v = arg.pop('uid', None)
779+
self.uid = uid if uid is not None else _v
780+
_v = arg.pop('visible', None)
781+
self.visible = visible if visible is not None else _v
782782

783783
# Read-only literals
784784
# ------------------

‎plotly/graph_objs/_bar.py

Copy file name to clipboardExpand all lines: plotly/graph_objs/_bar.py
+108-108Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -2058,114 +2058,114 @@ def __init__(
20582058

20592059
# Populate data dict with properties
20602060
# ----------------------------------
2061-
v = arg.pop('base', None)
2062-
self.base = base if base is not None else v
2063-
v = arg.pop('basesrc', None)
2064-
self.basesrc = basesrc if basesrc is not None else v
2065-
v = arg.pop('cliponaxis', None)
2066-
self.cliponaxis = cliponaxis if cliponaxis is not None else v
2067-
v = arg.pop('constraintext', None)
2068-
self.constraintext = constraintext if constraintext is not None else v
2069-
v = arg.pop('customdata', None)
2070-
self.customdata = customdata if customdata is not None else v
2071-
v = arg.pop('customdatasrc', None)
2072-
self.customdatasrc = customdatasrc if customdatasrc is not None else v
2073-
v = arg.pop('dx', None)
2074-
self.dx = dx if dx is not None else v
2075-
v = arg.pop('dy', None)
2076-
self.dy = dy if dy is not None else v
2077-
v = arg.pop('error_x', None)
2078-
self.error_x = error_x if error_x is not None else v
2079-
v = arg.pop('error_y', None)
2080-
self.error_y = error_y if error_y is not None else v
2081-
v = arg.pop('hoverinfo', None)
2082-
self.hoverinfo = hoverinfo if hoverinfo is not None else v
2083-
v = arg.pop('hoverinfosrc', None)
2084-
self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else v
2085-
v = arg.pop('hoverlabel', None)
2086-
self.hoverlabel = hoverlabel if hoverlabel is not None else v
2087-
v = arg.pop('hovertext', None)
2088-
self.hovertext = hovertext if hovertext is not None else v
2089-
v = arg.pop('hovertextsrc', None)
2090-
self.hovertextsrc = hovertextsrc if hovertextsrc is not None else v
2091-
v = arg.pop('ids', None)
2092-
self.ids = ids if ids is not None else v
2093-
v = arg.pop('idssrc', None)
2094-
self.idssrc = idssrc if idssrc is not None else v
2095-
v = arg.pop('insidetextfont', None)
2096-
self.insidetextfont = insidetextfont if insidetextfont is not None else v
2097-
v = arg.pop('legendgroup', None)
2098-
self.legendgroup = legendgroup if legendgroup is not None else v
2099-
v = arg.pop('marker', None)
2100-
self.marker = marker if marker is not None else v
2101-
v = arg.pop('name', None)
2102-
self.name = name if name is not None else v
2103-
v = arg.pop('offset', None)
2104-
self.offset = offset if offset is not None else v
2105-
v = arg.pop('offsetsrc', None)
2106-
self.offsetsrc = offsetsrc if offsetsrc is not None else v
2107-
v = arg.pop('opacity', None)
2108-
self.opacity = opacity if opacity is not None else v
2109-
v = arg.pop('orientation', None)
2110-
self.orientation = orientation if orientation is not None else v
2111-
v = arg.pop('outsidetextfont', None)
2112-
self.outsidetextfont = outsidetextfont if outsidetextfont is not None else v
2113-
v = arg.pop('r', None)
2114-
self.r = r if r is not None else v
2115-
v = arg.pop('rsrc', None)
2116-
self.rsrc = rsrc if rsrc is not None else v
2117-
v = arg.pop('selected', None)
2118-
self.selected = selected if selected is not None else v
2119-
v = arg.pop('selectedpoints', None)
2120-
self.selectedpoints = selectedpoints if selectedpoints is not None else v
2121-
v = arg.pop('showlegend', None)
2122-
self.showlegend = showlegend if showlegend is not None else v
2123-
v = arg.pop('stream', None)
2124-
self.stream = stream if stream is not None else v
2125-
v = arg.pop('t', None)
2126-
self.t = t if t is not None else v
2127-
v = arg.pop('text', None)
2128-
self.text = text if text is not None else v
2129-
v = arg.pop('textfont', None)
2130-
self.textfont = textfont if textfont is not None else v
2131-
v = arg.pop('textposition', None)
2132-
self.textposition = textposition if textposition is not None else v
2133-
v = arg.pop('textpositionsrc', None)
2134-
self.textpositionsrc = textpositionsrc if textpositionsrc is not None else v
2135-
v = arg.pop('textsrc', None)
2136-
self.textsrc = textsrc if textsrc is not None else v
2137-
v = arg.pop('tsrc', None)
2138-
self.tsrc = tsrc if tsrc is not None else v
2139-
v = arg.pop('uid', None)
2140-
self.uid = uid if uid is not None else v
2141-
v = arg.pop('unselected', None)
2142-
self.unselected = unselected if unselected is not None else v
2143-
v = arg.pop('visible', None)
2144-
self.visible = visible if visible is not None else v
2145-
v = arg.pop('width', None)
2146-
self.width = width if width is not None else v
2147-
v = arg.pop('widthsrc', None)
2148-
self.widthsrc = widthsrc if widthsrc is not None else v
2149-
v = arg.pop('x', None)
2150-
self.x = x if x is not None else v
2151-
v = arg.pop('x0', None)
2152-
self.x0 = x0 if x0 is not None else v
2153-
v = arg.pop('xaxis', None)
2154-
self.xaxis = xaxis if xaxis is not None else v
2155-
v = arg.pop('xcalendar', None)
2156-
self.xcalendar = xcalendar if xcalendar is not None else v
2157-
v = arg.pop('xsrc', None)
2158-
self.xsrc = xsrc if xsrc is not None else v
2159-
v = arg.pop('y', None)
2160-
self.y = y if y is not None else v
2161-
v = arg.pop('y0', None)
2162-
self.y0 = y0 if y0 is not None else v
2163-
v = arg.pop('yaxis', None)
2164-
self.yaxis = yaxis if yaxis is not None else v
2165-
v = arg.pop('ycalendar', None)
2166-
self.ycalendar = ycalendar if ycalendar is not None else v
2167-
v = arg.pop('ysrc', None)
2168-
self.ysrc = ysrc if ysrc is not None else v
2061+
_v = arg.pop('base', None)
2062+
self.base = base if base is not None else _v
2063+
_v = arg.pop('basesrc', None)
2064+
self.basesrc = basesrc if basesrc is not None else _v
2065+
_v = arg.pop('cliponaxis', None)
2066+
self.cliponaxis = cliponaxis if cliponaxis is not None else _v
2067+
_v = arg.pop('constraintext', None)
2068+
self.constraintext = constraintext if constraintext is not None else _v
2069+
_v = arg.pop('customdata', None)
2070+
self.customdata = customdata if customdata is not None else _v
2071+
_v = arg.pop('customdatasrc', None)
2072+
self.customdatasrc = customdatasrc if customdatasrc is not None else _v
2073+
_v = arg.pop('dx', None)
2074+
self.dx = dx if dx is not None else _v
2075+
_v = arg.pop('dy', None)
2076+
self.dy = dy if dy is not None else _v
2077+
_v = arg.pop('error_x', None)
2078+
self.error_x = error_x if error_x is not None else _v
2079+
_v = arg.pop('error_y', None)
2080+
self.error_y = error_y if error_y is not None else _v
2081+
_v = arg.pop('hoverinfo', None)
2082+
self.hoverinfo = hoverinfo if hoverinfo is not None else _v
2083+
_v = arg.pop('hoverinfosrc', None)
2084+
self.hoverinfosrc = hoverinfosrc if hoverinfosrc is not None else _v
2085+
_v = arg.pop('hoverlabel', None)
2086+
self.hoverlabel = hoverlabel if hoverlabel is not None else _v
2087+
_v = arg.pop('hovertext', None)
2088+
self.hovertext = hovertext if hovertext is not None else _v
2089+
_v = arg.pop('hovertextsrc', None)
2090+
self.hovertextsrc = hovertextsrc if hovertextsrc is not None else _v
2091+
_v = arg.pop('ids', None)
2092+
self.ids = ids if ids is not None else _v
2093+
_v = arg.pop('idssrc', None)
2094+
self.idssrc = idssrc if idssrc is not None else _v
2095+
_v = arg.pop('insidetextfont', None)
2096+
self.insidetextfont = insidetextfont if insidetextfont is not None else _v
2097+
_v = arg.pop('legendgroup', None)
2098+
self.legendgroup = legendgroup if legendgroup is not None else _v
2099+
_v = arg.pop('marker', None)
2100+
self.marker = marker if marker is not None else _v
2101+
_v = arg.pop('name', None)
2102+
self.name = name if name is not None else _v
2103+
_v = arg.pop('offset', None)
2104+
self.offset = offset if offset is not None else _v
2105+
_v = arg.pop('offsetsrc', None)
2106+
self.offsetsrc = offsetsrc if offsetsrc is not None else _v
2107+
_v = arg.pop('opacity', None)
2108+
self.opacity = opacity if opacity is not None else _v
2109+
_v = arg.pop('orientation', None)
2110+
self.orientation = orientation if orientation is not None else _v
2111+
_v = arg.pop('outsidetextfont', None)
2112+
self.outsidetextfont = outsidetextfont if outsidetextfont is not None else _v
2113+
_v = arg.pop('r', None)
2114+
self.r = r if r is not None else _v
2115+
_v = arg.pop('rsrc', None)
2116+
self.rsrc = rsrc if rsrc is not None else _v
2117+
_v = arg.pop('selected', None)
2118+
self.selected = selected if selected is not None else _v
2119+
_v = arg.pop('selectedpoints', None)
2120+
self.selectedpoints = selectedpoints if selectedpoints is not None else _v
2121+
_v = arg.pop('showlegend', None)
2122+
self.showlegend = showlegend if showlegend is not None else _v
2123+
_v = arg.pop('stream', None)
2124+
self.stream = stream if stream is not None else _v
2125+
_v = arg.pop('t', None)
2126+
self.t = t if t is not None else _v
2127+
_v = arg.pop('text', None)
2128+
self.text = text if text is not None else _v
2129+
_v = arg.pop('textfont', None)
2130+
self.textfont = textfont if textfont is not None else _v
2131+
_v = arg.pop('textposition', None)
2132+
self.textposition = textposition if textposition is not None else _v
2133+
_v = arg.pop('textpositionsrc', None)
2134+
self.textpositionsrc = textpositionsrc if textpositionsrc is not None else _v
2135+
_v = arg.pop('textsrc', None)
2136+
self.textsrc = textsrc if textsrc is not None else _v
2137+
_v = arg.pop('tsrc', None)
2138+
self.tsrc = tsrc if tsrc is not None else _v
2139+
_v = arg.pop('uid', None)
2140+
self.uid = uid if uid is not None else _v
2141+
_v = arg.pop('unselected', None)
2142+
self.unselected = unselected if unselected is not None else _v
2143+
_v = arg.pop('visible', None)
2144+
self.visible = visible if visible is not None else _v
2145+
_v = arg.pop('width', None)
2146+
self.width = width if width is not None else _v
2147+
_v = arg.pop('widthsrc', None)
2148+
self.widthsrc = widthsrc if widthsrc is not None else _v
2149+
_v = arg.pop('x', None)
2150+
self.x = x if x is not None else _v
2151+
_v = arg.pop('x0', None)
2152+
self.x0 = x0 if x0 is not None else _v
2153+
_v = arg.pop('xaxis', None)
2154+
self.xaxis = xaxis if xaxis is not None else _v
2155+
_v = arg.pop('xcalendar', None)
2156+
self.xcalendar = xcalendar if xcalendar is not None else _v
2157+
_v = arg.pop('xsrc', None)
2158+
self.xsrc = xsrc if xsrc is not None else _v
2159+
_v = arg.pop('y', None)
2160+
self.y = y if y is not None else _v
2161+
_v = arg.pop('y0', None)
2162+
self.y0 = y0 if y0 is not None else _v
2163+
_v = arg.pop('yaxis', None)
2164+
self.yaxis = yaxis if yaxis is not None else _v
2165+
_v = arg.pop('ycalendar', None)
2166+
self.ycalendar = ycalendar if ycalendar is not None else _v
2167+
_v = arg.pop('ysrc', None)
2168+
self.ysrc = ysrc if ysrc is not None else _v
21692169

21702170
# Read-only literals
21712171
# ------------------

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.