Skip to content

Commit 5d493f9

Browse files
KullyKully
committed
f0d863d + messing around in basevalidators (CODEGEN works)
1 parent a88e3d4 commit 5d493f9

File tree

7 files changed

+109
-36
lines changed

7 files changed

+109
-36
lines changed

‎_plotly_utils/basevalidators.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
except ImportError:
2828
pass
2929

30-
30+
# TODO: replace re.fullmatch with function below
31+
# back-port of fullmatch from Py3.4+
32+
def fullmatch(regex, string, flags=0):
33+
"""Emulate python-3.4 re.fullmatch()."""
34+
return re.match("(?:" + regex + r")\Z", string, flags=flags)
3135

3236

3337
# Utility functions
@@ -133,8 +137,7 @@ def type_str(v):
133137

134138
# Validators
135139
# ----------
136-
# object
137-
class BaseValidator:
140+
class BaseValidator(object):
138141
"""
139142
Base class for all validator classes
140143
"""
@@ -478,6 +481,7 @@ class BooleanValidator(BaseValidator):
478481
]
479482
},
480483
"""
484+
481485
def __init__(self, plotly_name, parent_name, **kwargs):
482486
super().__init__(
483487
plotly_name=plotly_name, parent_name=parent_name, **kwargs)

‎codegen/datatypes.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,8 @@ def __init__(self""")
189189
header = f"Construct a new {datatype_class} object"
190190
add_docstring(buffer, node, header=header)
191191

192-
# {node.name_base_datatype}, self
193192
buffer.write(f"""
194-
super().__init__('{node.name_property}')
193+
super({node.name_base_datatype}, self).__init__('{node.name_property}')
195194
196195
# Import validators
197196
# -----------------

‎codegen/figure.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ class {fig_classname}({base_classname}):\n""")
6666
layout_description = reindent_validator_description(layout_validator, 8)
6767
frames_description = reindent_validator_description(frame_validator, 8)
6868

69-
# {base_classname}, self
7069
buffer.write(f"""
7170
def __init__(self, data=None, layout=None, frames=None):
7271
\"\"\"
@@ -81,7 +80,7 @@ def __init__(self, data=None, layout=None, frames=None):
8180
frames
8281
{frames_description}
8382
\"\"\"
84-
super().__init__(data, layout, frames)
83+
super({base_classname}, self).__init__(data, layout, frames)
8584
""")
8685

8786
# ### add_trace methods for each trace type ###

‎codegen/validators.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ def __init__(self, plotly_name={params['plotly_name']},
5252
**kwargs):""")
5353

5454
# ### Write constructor ###
55-
# {superclass_name}, self
5655
buffer.write(f"""
5756
super({superclass_name}, self).__init__(plotly_name=plotly_name,
58-
parent_name=parent_name,
59-
**kwargs""")
60-
57+
parent_name=parent_name""")
6158

6259
# Write out remaining constructor parameters
6360
for attr_name, attr_val in params.items():
@@ -69,8 +66,8 @@ def __init__(self, plotly_name={params['plotly_name']},
6966
{attr_name}={attr_val}""")
7067

7168
# write **kwargs at the end to make Py2 compatible
72-
#buffer.write(f""",
73-
# **kwargs""")
69+
buffer.write(f""",
70+
**kwargs""")
7471

7572
buffer.write(')')
7673

@@ -174,7 +171,6 @@ def build_data_validator_py(base_trace_node: TraceNode):
174171
# -----------------
175172
buffer = StringIO()
176173

177-
# _plotly_utils.basevalidators.BaseDataValidator, self
178174
buffer.write(f"""
179175
import _plotly_utils.basevalidators
180176
@@ -184,7 +180,7 @@ def __init__(self, plotly_name={params['plotly_name']},
184180
parent_name={params['parent_name']},
185181
**kwargs):
186182
187-
super().__init__(class_strs_map={params['class_strs_map']},
183+
super(_plotly_utils.basevalidators.BaseDataValidator, self).__init__(class_strs_map={params['class_strs_map']},
188184
plotly_name=plotly_name,
189185
parent_name=parent_name,
190186
**kwargs)""")

‎plotly/basedatatypes.py‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def fullmatch(regex, string, flags=0):
3333
"""Emulate python-3.4 re.fullmatch()."""
3434
return re.match("(?:" + regex + r")\Z", string, flags=flags)
3535

36-
# (object)
37-
class BaseFigure:
36+
37+
class BaseFigure(object):
3838
"""
3939
Base class for all figure types (both widget and non-widget)
4040
"""
@@ -748,8 +748,8 @@ def _str_to_dict_path(key_path_str):
748748
bracket_re = re.compile('(.*)\[(\d+)\]')
749749
key_path2 = []
750750
for key in key_path:
751-
#match = fullmatch(bracket_re.pattern, key)
752-
match = bracket_re.fullmatch(key)
751+
match = fullmatch(bracket_re.pattern, key)
752+
#match = bracket_re.fullmatch(key)
753753
if match:
754754
key_path2.extend(match.groups())
755755
else:
@@ -2937,9 +2937,6 @@ def _set_compound_prop(self, prop, val):
29372937
# ------------
29382938
validator = self._validators.get(prop)
29392939
# type: BasePlotlyType
2940-
print(val)
2941-
print(type(val))
2942-
print('\n')
29432940
val = validator.validate_coerce(val)
29442941

29452942
# Save deep copies of current and new states
@@ -3399,16 +3396,16 @@ def _process_kwargs(self, **kwargs):
33993396
unknown_kwargs = {
34003397
k: v
34013398
for k, v in kwargs.items()
3402-
if not self._subplotid_prop_re.fullmatch(k)
3403-
#if not fullmatch(self._subplotid_prop_re.pattern, k)
3399+
# if not self._subplotid_prop_re.fullmatch(k)
3400+
if not fullmatch(self._subplotid_prop_re.pattern, k)
34043401
}
34053402
super(BaseLayoutHierarchyType, self)._process_kwargs(**unknown_kwargs)
34063403

34073404
subplot_kwargs = {
34083405
k: v
34093406
for k, v in kwargs.items()
3410-
if self._subplotid_prop_re.fullmatch(k)
3411-
# if fullmatch(self._subplotid_prop_re.pattern, k)
3407+
# if self._subplotid_prop_re.fullmatch(k)
3408+
if fullmatch(self._subplotid_prop_re.pattern, k)
34123409
}
34133410

34143411
for prop, value in subplot_kwargs.items():
@@ -3428,8 +3425,8 @@ def _set_subplotid_prop(self, prop, value):
34283425
# Get regular expression match
34293426
# ----------------------------
34303427
# Note: we already tested that match exists in the constructor
3431-
match = self._subplotid_prop_re.fullmatch(prop)
3432-
# match = fullmatch(self._subplotid_prop_re.pattern, prop)
3428+
# match = self._subplotid_prop_re.fullmatch(prop)
3429+
match = fullmatch(self._subplotid_prop_re.pattern, prop)
34333430

34343431
subplot_prop = match.group(1)
34353432
suffix_digit = int(match.group(2))
@@ -3491,8 +3488,8 @@ def _strip_subplot_suffix_of_1(self, prop):
34913488
# Handle subplot suffix digit of 1
34923489
# --------------------------------
34933490
# Remove digit of 1 from subplot id (e.g.. xaxis1 -> xaxis)
3494-
match = self._subplotid_prop_re.fullmatch(prop)
3495-
# match = fullmatch(self._subplotid_prop_re.pattern, prop)
3491+
# match = self._subplotid_prop_re.fullmatch(prop)
3492+
match = fullmatch(self._subplotid_prop_re.pattern, prop)
34963493

34973494
if match:
34983495
subplot_prop = match.group(1)
@@ -3544,8 +3541,8 @@ def __setitem__(self, prop, value):
35443541

35453542
# Check for subplot assignment
35463543
# ----------------------------
3547-
match = self._subplotid_prop_re.fullmatch(prop)
3548-
# match = fullmatch(self._subplotid_prop_re.pattern, prop)
3544+
# match = self._subplotid_prop_re.fullmatch(prop)
3545+
match = fullmatch(self._subplotid_prop_re.pattern, prop)
35493546
if match is None:
35503547
# Set as ordinary property
35513548
super(BaseLayoutHierarchyType, self).__setitem__(prop, value)
@@ -3559,8 +3556,8 @@ def __setattr__(self, prop, value):
35593556
"""
35603557
# Check for subplot assignment
35613558
# ----------------------------
3562-
match = self._subplotid_prop_re.fullmatch(prop)
3563-
# match = fullmatch(self._subplotid_prop_re.pattern, prop)
3559+
# match = self._subplotid_prop_re.fullmatch(prop)
3560+
match = fullmatch(self._subplotid_prop_re.pattern, prop)
35643561
if match is None:
35653562
# Set as ordinary property
35663563
super(BaseLayoutHierarchyType, self).__setattr__(prop, value)
@@ -3582,8 +3579,7 @@ class BaseTraceHierarchyType(BasePlotlyType):
35823579
"""
35833580

35843581
def __init__(self, plotly_name, **kwargs):
3585-
# BaseTraceHierarchyType
3586-
super(BasePlotlyType, self).__init__(plotly_name, **kwargs)
3582+
super(BaseTraceHierarchyType, self).__init__(plotly_name, **kwargs)
35873583

35883584
def _send_prop_set(self, prop_path_str, val):
35893585
if self.parent:

‎plotly/graph_objs/__init__.py‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
from ._violin import Violin
2+
from plotly.graph_objs import violin
3+
from ._table import Table
4+
from plotly.graph_objs import table
5+
from ._surface import Surface
6+
from plotly.graph_objs import surface
7+
from ._scatterternary import Scatterternary
8+
from plotly.graph_objs import scatterternary
9+
from ._scatterpolargl import Scatterpolargl
10+
from plotly.graph_objs import scatterpolargl
11+
from ._scatterpolar import Scatterpolar
12+
from plotly.graph_objs import scatterpolar
13+
from ._scattermapbox import Scattermapbox
14+
from plotly.graph_objs import scattermapbox
15+
from ._scattergl import Scattergl
16+
from plotly.graph_objs import scattergl
17+
from ._scattergeo import Scattergeo
18+
from plotly.graph_objs import scattergeo
19+
from ._scattercarpet import Scattercarpet
20+
from plotly.graph_objs import scattercarpet
21+
from ._scatter3d import Scatter3d
22+
from plotly.graph_objs import scatter3d
23+
from ._scatter import Scatter
24+
from plotly.graph_objs import scatter
25+
from ._sankey import Sankey
26+
from plotly.graph_objs import sankey
27+
from ._pointcloud import Pointcloud
28+
from plotly.graph_objs import pointcloud
29+
from ._pie import Pie
30+
from plotly.graph_objs import pie
31+
from ._parcoords import Parcoords
32+
from plotly.graph_objs import parcoords
33+
from ._ohlc import Ohlc
34+
from plotly.graph_objs import ohlc
35+
from ._mesh3d import Mesh3d
36+
from plotly.graph_objs import mesh3d
37+
from ._histogram2dcontour import Histogram2dContour
38+
from plotly.graph_objs import histogram2dcontour
39+
from ._histogram2d import Histogram2d
40+
from plotly.graph_objs import histogram2d
41+
from ._histogram import Histogram
42+
from plotly.graph_objs import histogram
43+
from ._heatmapgl import Heatmapgl
44+
from plotly.graph_objs import heatmapgl
45+
from ._heatmap import Heatmap
46+
from plotly.graph_objs import heatmap
47+
from ._contourcarpet import Contourcarpet
48+
from plotly.graph_objs import contourcarpet
49+
from ._contour import Contour
50+
from plotly.graph_objs import contour
51+
from ._choropleth import Choropleth
52+
from plotly.graph_objs import choropleth
53+
from ._carpet import Carpet
54+
from plotly.graph_objs import carpet
55+
from ._candlestick import Candlestick
56+
from plotly.graph_objs import candlestick
57+
from ._box import Box
58+
from plotly.graph_objs import box
59+
from ._bar import Bar
60+
from plotly.graph_objs import bar
61+
from ._area import Area
62+
from plotly.graph_objs import area
63+
from ._layout import Layout
64+
from plotly.graph_objs import layout
65+
from ._frame import Frame
66+
from ._figure import Figure
67+
68+
try:
69+
import ipywidgets
70+
from ._figurewidget import FigureWidget
71+
except ImportError:
72+
pass
73+
74+
from ._deprecations import (
75+
Data, Annotations, Frames, AngularAxis, Annotation, ColorBar, Contours,
76+
ErrorX, ErrorY, ErrorZ, Font, Legend, Line, Margin, Marker, RadialAxis,
77+
Scene, Stream, XAxis, YAxis, ZAxis, XBins, YBins, Trace, Histogram2dcontour
78+
)

‎plotly/graph_objs/graph_objs.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from plotly.graph_objs import *

0 commit comments

Comments
 (0)