Skip to content

Commit ad6ba8b

Browse files
jonmmeasejonmmease
committed
Import classes before submodules to fix Python < 3.7 import error
1 parent d6e98d9 commit ad6ba8b

File tree

135 files changed

+360
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+360
-381
lines changed

‎packages/python/plotly/codegen/utils.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def build_from_imports_py(rel_modules=(), rel_classes=(), init_extra=""):
6464
rel_classes = list(rel_classes)
6565

6666
import_lines = []
67-
for rel in rel_modules + rel_classes:
67+
for rel in rel_classes + rel_modules:
6868
rel_parts = rel.split(".")
6969
parent_module = ".".join(rel_parts[:-1]) or "."
7070
import_target = rel_parts[-1]
@@ -90,27 +90,6 @@ def build_from_imports_py(rel_modules=(), rel_classes=(), init_extra=""):
9090
return result
9191

9292

93-
# buffer = StringIO()
94-
# for import_info in imports_info:
95-
#
96-
# if isinstance(import_info, tuple):
97-
# from_pkg, class_name = import_info
98-
# if isinstance(class_name, str):
99-
# class_name_str = class_name
100-
# else:
101-
# class_name_str = "(" + ", ".join(class_name) + ")"
102-
#
103-
# buffer.write(
104-
# f"""\
105-
# from {from_pkg} import {class_name_str}\n"""
106-
# )
107-
#
108-
# elif isinstance(import_info, str):
109-
# buffer.write(import_info)
110-
#
111-
# return buffer.getvalue()
112-
113-
11493
def write_init_py(pkg_root, path_parts, rel_modules=(), rel_classes=(), init_extra=""):
11594
"""
11695
Build __init__.py source code and write to a file

‎packages/python/plotly/plotly/graph_objects/__init__.py

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,6 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from ..graph_objs import waterfall
5-
from ..graph_objs import volume
6-
from ..graph_objs import violin
7-
from ..graph_objs import treemap
8-
from ..graph_objs import table
9-
from ..graph_objs import surface
10-
from ..graph_objs import sunburst
11-
from ..graph_objs import streamtube
12-
from ..graph_objs import splom
13-
from ..graph_objs import scatterternary
14-
from ..graph_objs import scatterpolargl
15-
from ..graph_objs import scatterpolar
16-
from ..graph_objs import scattermapbox
17-
from ..graph_objs import scattergl
18-
from ..graph_objs import scattergeo
19-
from ..graph_objs import scattercarpet
20-
from ..graph_objs import scatter3d
21-
from ..graph_objs import scatter
22-
from ..graph_objs import sankey
23-
from ..graph_objs import pointcloud
24-
from ..graph_objs import pie
25-
from ..graph_objs import parcoords
26-
from ..graph_objs import parcats
27-
from ..graph_objs import ohlc
28-
from ..graph_objs import mesh3d
29-
from ..graph_objs import isosurface
30-
from ..graph_objs import indicator
31-
from ..graph_objs import image
32-
from ..graph_objs import histogram2dcontour
33-
from ..graph_objs import histogram2d
34-
from ..graph_objs import histogram
35-
from ..graph_objs import heatmapgl
36-
from ..graph_objs import heatmap
37-
from ..graph_objs import funnelarea
38-
from ..graph_objs import funnel
39-
from ..graph_objs import densitymapbox
40-
from ..graph_objs import contourcarpet
41-
from ..graph_objs import contour
42-
from ..graph_objs import cone
43-
from ..graph_objs import choroplethmapbox
44-
from ..graph_objs import choropleth
45-
from ..graph_objs import carpet
46-
from ..graph_objs import candlestick
47-
from ..graph_objs import box
48-
from ..graph_objs import barpolar
49-
from ..graph_objs import bar
50-
from ..graph_objs import area
51-
from ..graph_objs import layout
524
from ..graph_objs import Waterfall
535
from ..graph_objs import Volume
546
from ..graph_objs import Violin
@@ -124,6 +76,54 @@
12476
from ..graph_objs import YBins
12577
from ..graph_objs import Trace
12678
from ..graph_objs import Histogram2dcontour
79+
from ..graph_objs import waterfall
80+
from ..graph_objs import volume
81+
from ..graph_objs import violin
82+
from ..graph_objs import treemap
83+
from ..graph_objs import table
84+
from ..graph_objs import surface
85+
from ..graph_objs import sunburst
86+
from ..graph_objs import streamtube
87+
from ..graph_objs import splom
88+
from ..graph_objs import scatterternary
89+
from ..graph_objs import scatterpolargl
90+
from ..graph_objs import scatterpolar
91+
from ..graph_objs import scattermapbox
92+
from ..graph_objs import scattergl
93+
from ..graph_objs import scattergeo
94+
from ..graph_objs import scattercarpet
95+
from ..graph_objs import scatter3d
96+
from ..graph_objs import scatter
97+
from ..graph_objs import sankey
98+
from ..graph_objs import pointcloud
99+
from ..graph_objs import pie
100+
from ..graph_objs import parcoords
101+
from ..graph_objs import parcats
102+
from ..graph_objs import ohlc
103+
from ..graph_objs import mesh3d
104+
from ..graph_objs import isosurface
105+
from ..graph_objs import indicator
106+
from ..graph_objs import image
107+
from ..graph_objs import histogram2dcontour
108+
from ..graph_objs import histogram2d
109+
from ..graph_objs import histogram
110+
from ..graph_objs import heatmapgl
111+
from ..graph_objs import heatmap
112+
from ..graph_objs import funnelarea
113+
from ..graph_objs import funnel
114+
from ..graph_objs import densitymapbox
115+
from ..graph_objs import contourcarpet
116+
from ..graph_objs import contour
117+
from ..graph_objs import cone
118+
from ..graph_objs import choroplethmapbox
119+
from ..graph_objs import choropleth
120+
from ..graph_objs import carpet
121+
from ..graph_objs import candlestick
122+
from ..graph_objs import box
123+
from ..graph_objs import barpolar
124+
from ..graph_objs import bar
125+
from ..graph_objs import area
126+
from ..graph_objs import layout
127127
else:
128128
from _plotly_utils.importers import relative_import
129129

‎packages/python/plotly/plotly/graph_objs/__init__.py

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,6 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import waterfall
5-
from . import volume
6-
from . import violin
7-
from . import treemap
8-
from . import table
9-
from . import surface
10-
from . import sunburst
11-
from . import streamtube
12-
from . import splom
13-
from . import scatterternary
14-
from . import scatterpolargl
15-
from . import scatterpolar
16-
from . import scattermapbox
17-
from . import scattergl
18-
from . import scattergeo
19-
from . import scattercarpet
20-
from . import scatter3d
21-
from . import scatter
22-
from . import sankey
23-
from . import pointcloud
24-
from . import pie
25-
from . import parcoords
26-
from . import parcats
27-
from . import ohlc
28-
from . import mesh3d
29-
from . import isosurface
30-
from . import indicator
31-
from . import image
32-
from . import histogram2dcontour
33-
from . import histogram2d
34-
from . import histogram
35-
from . import heatmapgl
36-
from . import heatmap
37-
from . import funnelarea
38-
from . import funnel
39-
from . import densitymapbox
40-
from . import contourcarpet
41-
from . import contour
42-
from . import cone
43-
from . import choroplethmapbox
44-
from . import choropleth
45-
from . import carpet
46-
from . import candlestick
47-
from . import box
48-
from . import barpolar
49-
from . import bar
50-
from . import area
51-
from . import layout
524
from ._waterfall import Waterfall
535
from ._volume import Volume
546
from ._violin import Violin
@@ -124,6 +76,54 @@
12476
from ._deprecations import YBins
12577
from ._deprecations import Trace
12678
from ._deprecations import Histogram2dcontour
79+
from . import waterfall
80+
from . import volume
81+
from . import violin
82+
from . import treemap
83+
from . import table
84+
from . import surface
85+
from . import sunburst
86+
from . import streamtube
87+
from . import splom
88+
from . import scatterternary
89+
from . import scatterpolargl
90+
from . import scatterpolar
91+
from . import scattermapbox
92+
from . import scattergl
93+
from . import scattergeo
94+
from . import scattercarpet
95+
from . import scatter3d
96+
from . import scatter
97+
from . import sankey
98+
from . import pointcloud
99+
from . import pie
100+
from . import parcoords
101+
from . import parcats
102+
from . import ohlc
103+
from . import mesh3d
104+
from . import isosurface
105+
from . import indicator
106+
from . import image
107+
from . import histogram2dcontour
108+
from . import histogram2d
109+
from . import histogram
110+
from . import heatmapgl
111+
from . import heatmap
112+
from . import funnelarea
113+
from . import funnel
114+
from . import densitymapbox
115+
from . import contourcarpet
116+
from . import contour
117+
from . import cone
118+
from . import choroplethmapbox
119+
from . import choropleth
120+
from . import carpet
121+
from . import candlestick
122+
from . import box
123+
from . import barpolar
124+
from . import bar
125+
from . import area
126+
from . import layout
127127
else:
128128
from _plotly_utils.importers import relative_import
129129

‎packages/python/plotly/plotly/graph_objs/area/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import hoverlabel
54
from ._stream import Stream
65
from ._marker import Marker
76
from ._hoverlabel import Hoverlabel
7+
from . import hoverlabel
88
else:
99
from _plotly_utils.importers import relative_import
1010

‎packages/python/plotly/plotly/graph_objs/bar/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import unselected
5-
from . import selected
6-
from . import marker
7-
from . import hoverlabel
84
from ._unselected import Unselected
95
from ._textfont import Textfont
106
from ._stream import Stream
@@ -15,6 +11,10 @@
1511
from ._hoverlabel import Hoverlabel
1612
from ._error_y import ErrorY
1713
from ._error_x import ErrorX
14+
from . import unselected
15+
from . import selected
16+
from . import marker
17+
from . import hoverlabel
1818
else:
1919
from _plotly_utils.importers import relative_import
2020

‎packages/python/plotly/plotly/graph_objs/bar/marker/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import colorbar
54
from ._line import Line
65
from ._colorbar import ColorBar
6+
from . import colorbar
77
else:
88
from _plotly_utils.importers import relative_import
99

‎packages/python/plotly/plotly/graph_objs/bar/marker/colorbar/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import title
54
from ._title import Title
65
from ._tickformatstop import Tickformatstop
76
from ._tickfont import Tickfont
7+
from . import title
88
else:
99
from _plotly_utils.importers import relative_import
1010

‎packages/python/plotly/plotly/graph_objs/barpolar/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import unselected
5-
from . import selected
6-
from . import marker
7-
from . import hoverlabel
84
from ._unselected import Unselected
95
from ._stream import Stream
106
from ._selected import Selected
117
from ._marker import Marker
128
from ._hoverlabel import Hoverlabel
9+
from . import unselected
10+
from . import selected
11+
from . import marker
12+
from . import hoverlabel
1313
else:
1414
from _plotly_utils.importers import relative_import
1515

‎packages/python/plotly/plotly/graph_objs/barpolar/marker/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import colorbar
54
from ._line import Line
65
from ._colorbar import ColorBar
6+
from . import colorbar
77
else:
88
from _plotly_utils.importers import relative_import
99

‎packages/python/plotly/plotly/graph_objs/barpolar/marker/colorbar/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import title
54
from ._title import Title
65
from ._tickformatstop import Tickformatstop
76
from ._tickfont import Tickfont
7+
from . import title
88
else:
99
from _plotly_utils.importers import relative_import
1010

‎packages/python/plotly/plotly/graph_objs/box/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import unselected
5-
from . import selected
6-
from . import marker
7-
from . import hoverlabel
84
from ._unselected import Unselected
95
from ._stream import Stream
106
from ._selected import Selected
117
from ._marker import Marker
128
from ._line import Line
139
from ._hoverlabel import Hoverlabel
10+
from . import unselected
11+
from . import selected
12+
from . import marker
13+
from . import hoverlabel
1414
else:
1515
from _plotly_utils.importers import relative_import
1616

‎packages/python/plotly/plotly/graph_objs/candlestick/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import sys
22

33
if sys.version_info < (3, 7):
4-
from . import increasing
5-
from . import hoverlabel
6-
from . import decreasing
74
from ._stream import Stream
85
from ._line import Line
96
from ._increasing import Increasing
107
from ._hoverlabel import Hoverlabel
118
from ._decreasing import Decreasing
9+
from . import increasing
10+
from . import hoverlabel
11+
from . import decreasing
1212
else:
1313
from _plotly_utils.importers import relative_import
1414

0 commit comments

Comments
 (0)