Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 697f84c

Browse files
jonmmeasejonmmease
committed
Remove deprecated imports, replace with error pointing to chart_studio package
1 parent a9eb00c commit 697f84c

File tree

15 files changed

+44
-100
lines changed

15 files changed

+44
-100
lines changed

‎_plotly_future_/__init__.py

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@ def _assert_plotly_not_imported():
3030

3131

3232
def _chart_studio_warning(submodule):
33-
if 'extract_chart_studio' in _future_flags:
34-
warnings.warn(
35-
'The plotly.{submodule} module is deprecated, '
36-
'please use chart_studio.{submodule} instead'
37-
.format(submodule=submodule),
38-
DeprecationWarning,
39-
stacklevel=2)
33+
warnings.warn(
34+
'The plotly.{submodule} module is deprecated, '
35+
'please use chart_studio.{submodule} instead'
36+
.format(submodule=submodule),
37+
DeprecationWarning,
38+
stacklevel=2)
39+
40+
41+
def _chart_studio_error(submodule):
42+
raise ImportError("""
43+
The plotly.{submodule} module is deprecated,
44+
please install the chart_studio package and use the
45+
chart_studio.{submodule} module instead.
46+
""".format(submodule=submodule))
4047

4148

4249
def _chart_studio_deprecation(fn):
@@ -54,15 +61,14 @@ def _chart_studio_deprecation(fn):
5461

5562
@functools.wraps(fn)
5663
def wrapper(*args, **kwargs):
57-
if 'extract_chart_studio' in _future_flags:
58-
warnings.warn(
59-
msg,
60-
DeprecationWarning,
61-
stacklevel=2)
64+
warnings.warn(
65+
msg,
66+
DeprecationWarning,
67+
stacklevel=2)
6268

6369
return fn(*args, **kwargs)
6470

6571
return wrapper
6672

6773

68-
__all__ = ['_future_flags', '_chart_studio_warning']
74+
__all__ = ['_future_flags', '_chart_studio_error']

‎plotly/api/utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Deprecations
2-
from _plotly_future_ import _future_flags
3-
if 'remove_deprecations' not in _future_flags:
4-
from chart_studio.api.utils import *
1+
from __future__ import absolute_import
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('api.utils')

‎plotly/api/v1.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _future_flags
4-
5-
6-
if 'remove_deprecations' not in _future_flags:
7-
from _plotly_future_ import _chart_studio_warning
8-
_chart_studio_warning('api.v1')
9-
from chart_studio.api.v1 import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('api.v1')

‎plotly/api/v2.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _future_flags
4-
5-
6-
if 'remove_deprecations' not in _future_flags:
7-
from _plotly_future_ import _chart_studio_warning
8-
_chart_studio_warning('api.v2')
9-
from chart_studio.api.v2 import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('api.v2')

‎plotly/config.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _chart_studio_warning
4-
_chart_studio_warning('config')
5-
from chart_studio.config import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('config')

‎plotly/dashboard_objs.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _future_flags
4-
5-
6-
if 'remove_deprecations' not in _future_flags:
7-
from _plotly_future_ import _chart_studio_warning
8-
_chart_studio_warning('dashboard_objs')
9-
from chart_studio.dashboard_objs import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('dashboard_objs')

‎plotly/exceptions.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1+
from __future__ import absolute_import
12
from _plotly_utils.exceptions import *
2-
3-
# Deprecations
4-
from _plotly_future_ import _future_flags
5-
if 'remove_deprecations' not in _future_flags:
6-
from chart_studio.exceptions import *

‎plotly/files.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1+
from __future__ import absolute_import
12
from _plotly_utils.files import *
2-
3-
# Deprecations
4-
from _plotly_future_ import _future_flags
5-
if 'remove_deprecations' not in _future_flags:
6-
from chart_studio.files import *

‎plotly/grid_objs.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _future_flags
4-
5-
6-
if 'remove_deprecations' not in _future_flags:
7-
from _plotly_future_ import _chart_studio_warning
8-
_chart_studio_warning('grid_objs')
9-
from chart_studio.grid_objs import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('grid_objs')

‎plotly/plotly/__init__.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _future_flags
4-
5-
if 'remove_deprecations' not in _future_flags:
6-
from _plotly_future_ import _chart_studio_warning
7-
_chart_studio_warning('plotly')
8-
from chart_studio.plotly import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('plotly')

‎plotly/plotly/chunked_requests.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _chart_studio_warning
4-
_chart_studio_warning('plotly.chunked_requests')
5-
from chart_studio.plotly.chunked_requests import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('plotly.chunked_requests')

‎plotly/presentation_objs.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _chart_studio_warning
4-
_chart_studio_warning('presentation_objs')
5-
from chart_studio.presentation_objs import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('presentation_objs')

‎plotly/session.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _future_flags
4-
5-
6-
if 'remove_deprecations' not in _future_flags:
7-
from _plotly_future_ import _chart_studio_warning
8-
_chart_studio_warning('session')
9-
from chart_studio.session import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('session')

‎plotly/utils.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,3 @@ def _default_memoize_key_function(*args, **kwargs):
254254
return args, frozenset(kwargs.items())
255255
else:
256256
return args
257-
258-
259-
# Deprecations
260-
from _plotly_future_ import _future_flags
261-
if 'remove_deprecations' not in _future_flags:
262-
from chart_studio.utils import *

‎plotly/widgets.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
from __future__ import absolute_import
2-
3-
from _plotly_future_ import _future_flags
4-
5-
6-
if 'remove_deprecations' not in _future_flags:
7-
from _plotly_future_ import _chart_studio_warning
8-
_chart_studio_warning('widgets')
9-
from chart_studio.widgets import *
2+
from _plotly_future_ import _chart_studio_error
3+
_chart_studio_error('widgets')

0 commit comments

Comments
 (0)