Skip to content

Commit a3d8650

Browse files
committed
Update error messages when anywidget isn't installed
1 parent ce96898 commit a3d8650

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

packages/python/plotly/codegen/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def perform_codegen():
276276
else:
277277
raise ImportError()
278278
except Exception:
279-
from ..missing_ipywidgets import FigureWidget
279+
from ..missing_anywidget import FigureWidget
280280
else:
281281
__all__.append("FigureWidget")
282282
orig_getattr = __getattr__
@@ -293,7 +293,7 @@ def __getattr__(import_name):
293293
else:
294294
raise ImportError()
295295
except Exception:
296-
from ..missing_ipywidgets import FigureWidget
296+
from ..missing_anywidget import FigureWidget
297297
return FigureWidget
298298
299299
return orig_getattr(import_name)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
else:
287287
raise ImportError()
288288
except Exception:
289-
from ..missing_ipywidgets import FigureWidget
289+
from ..missing_anywidget import FigureWidget
290290
else:
291291
__all__.append("FigureWidget")
292292
orig_getattr = __getattr__
@@ -304,7 +304,7 @@ def __getattr__(import_name):
304304
else:
305305
raise ImportError()
306306
except Exception:
307-
from ..missing_ipywidgets import FigureWidget
307+
from ..missing_anywidget import FigureWidget
308308

309309
return FigureWidget
310310

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
else:
287287
raise ImportError()
288288
except Exception:
289-
from ..missing_ipywidgets import FigureWidget
289+
from ..missing_anywidget import FigureWidget
290290
else:
291291
__all__.append("FigureWidget")
292292
orig_getattr = __getattr__
@@ -304,7 +304,7 @@ def __getattr__(import_name):
304304
else:
305305
raise ImportError()
306306
except Exception:
307-
from ..missing_ipywidgets import FigureWidget
307+
from ..missing_anywidget import FigureWidget
308308

309309
return FigureWidget
310310

packages/python/plotly/plotly/missing_ipywidgets.py renamed to packages/python/plotly/plotly/missing_anywidget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ class FigureWidget(BaseFigure):
1111

1212
def __init__(self, *args, **kwargs):
1313
raise ImportError(
14-
"Please install ipywidgets>=7.0.0 to use the FigureWidget class"
14+
"Please install anywidget to use the FigureWidget class"
1515
)

packages/python/plotly/plotly/tests/test_core/test_figure_widget_backend/test_missing_ipywigets.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@
22

33
# Use wildcard import to make sure FigureWidget is always included
44
from plotly.graph_objects import *
5-
from plotly.missing_ipywidgets import FigureWidget as FigureWidgetMissingIPywidgets
5+
from plotly.missing_anywidget import FigureWidget as FigureWidgetMissingAnywidget
66

77
try:
8-
import ipywidgets as _ipywidgets
8+
import anywidget as _anywidget
99
from packaging.version import Version as _Version
1010

11-
if _Version(_ipywidgets.__version__) >= _Version("7.0.0"):
12-
missing_ipywidgets = False
11+
if _Version(_anywidget.__version__) >= _Version("7.0.0"):
12+
missing_anywidget = False
1313
else:
1414
raise ImportError()
1515
except Exception:
16-
missing_ipywidgets = True
16+
missing_anywidget = True
1717

1818

19-
if missing_ipywidgets:
19+
if missing_anywidget:
2020

21-
def test_import_figurewidget_without_ipywidgets():
22-
assert FigureWidget is FigureWidgetMissingIPywidgets
21+
def test_import_figurewidget_without_anywidget():
22+
assert FigureWidget is FigureWidgetMissingAnywidget
2323

2424
with pytest.raises(ImportError):
25-
# ipywidgets import error raised on construction, not import
25+
# anywidget import error raised on construction, not import
2626
FigureWidget()
2727

2828
else:
2929

30-
def test_import_figurewidget_with_ipywidgets():
30+
def test_import_figurewidget_with_anywidget():
3131
from plotly.graph_objs._figurewidget import (
32-
FigureWidget as FigureWidgetWithIPywidgets,
32+
FigureWidget as FigureWidgetWithAnywidget,
3333
)
3434

35-
assert FigureWidget is FigureWidgetWithIPywidgets
35+
assert FigureWidget is FigureWidgetWithAnywidget
3636
fig = FigureWidget()
37-
assert isinstance(fig, FigureWidgetWithIPywidgets)
37+
assert isinstance(fig, FigureWidgetWithAnywidget)

0 commit comments

Comments
 (0)