Skip to content

Commit b8d7774

Browse files
minor fix to get_colorscale
1 parent 2a59bc0 commit b8d7774

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

Diff for: packages/python/plotly/_plotly_utils/colors/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,8 @@ def get_colorscale(name):
831831
raise exceptions.PlotlyError(f"Colorscale {name} is not a built-in scale.")
832832

833833
if should_reverse:
834-
return colorscale[::-1]
835-
return colorscale
834+
colorscale = colorscale[::-1]
835+
return make_colorscale(colorscale)
836836

837837

838838
def sample_colorscale(colorscale, samplepoints, low=0.0, high=1.0, colortype="rgb"):

Diff for: packages/python/plotly/plotly/express/colors/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@
4747
"plotlyjs",
4848
"DEFAULT_PLOTLY_COLORS",
4949
"PLOTLY_SCALES",
50+
"get_colorscale",
51+
"sample_colorscale",
5052
]

Diff for: packages/python/plotly/plotly/tests/test_core/test_colors/test_colors.py

+23-5
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,29 @@ def test_get_colorscale(self):
152152
self.assertRaisesRegex(PlotlyError, pattern, colors.get_colorscale, name)
153153

154154
# test non-capitalised access
155-
self.assertEqual(colors.sequential.haline, colors.get_colorscale("haline"))
155+
self.assertEqual(
156+
colors.make_colorscale(colors.sequential.haline),
157+
colors.get_colorscale("haline"),
158+
)
156159
# test capitalised access
157-
self.assertEqual(colors.diverging.Earth, colors.get_colorscale("Earth"))
160+
self.assertEqual(
161+
colors.make_colorscale(colors.diverging.Earth),
162+
colors.get_colorscale("Earth"),
163+
)
158164
# test accessing non-capitalised scale with capitalised name
159-
self.assertEqual(colors.cyclical.mrybm, colors.get_colorscale("Mrybm"))
165+
self.assertEqual(
166+
colors.make_colorscale(colors.cyclical.mrybm),
167+
colors.get_colorscale("Mrybm"),
168+
)
160169
# test accessing capitalised scale with non-capitalised name
161-
self.assertEqual(colors.sequential.Viridis, colors.get_colorscale("viridis"))
170+
self.assertEqual(
171+
colors.make_colorscale(colors.sequential.Viridis),
172+
colors.get_colorscale("viridis"),
173+
)
162174
# test accessing reversed scale
163175
self.assertEqual(
164-
colors.diverging.Portland_r, colors.get_colorscale("portland_r")
176+
colors.make_colorscale(colors.diverging.Portland_r),
177+
colors.get_colorscale("portland_r"),
165178
)
166179

167180
def test_sample_colorscale(self):
@@ -194,3 +207,8 @@ def test_sample_colorscale(self):
194207
defined_colors, samplepoints, colortype="tuple"
195208
)
196209
self.assertEqual(expected_output, output)
210+
211+
self.assertEqual(
212+
colors.sample_colorscale("TuRbId_r", 12),
213+
colors.sequential.turbid_r,
214+
)

0 commit comments

Comments
 (0)