remove references to showLink and linkText

Author: emilykl

plotly/io/_html.py

@@ -179,21 +179,10 @@ def to_html(
     else:
         div_height = str(div_height) + "px"
 
-    # ## Get platform URL ##
-    if config.get("showLink", False) or config.get("showSendToCloud", False):
-        # Figure is going to include a Chart Studio link or send-to-cloud button,
-        # So we need to configure the PLOTLYENV.BASE_URL property
-        base_url_line = """
-                    window.PLOTLYENV.BASE_URL='{plotly_platform_url}';\
-""".format(plotly_platform_url=config.get("plotlyServerURL", "https://plot.ly"))
-    else:
-        # Figure is not going to include a Chart Studio link or send-to-cloud button,
-        # In this case we don't want https://plot.ly to show up anywhere in the HTML
-        # output
+    # Remove plotlyServerURL from config if showSendToCloud is False,
+    # so that a Plotly URL does not appear in the HTML output
+    if not config.get("showSendToCloud", False):
         config.pop("plotlyServerURL", None)
-        config.pop("linkText", None)
-        config.pop("showLink", None)
-        base_url_line = ""
 
     # ## Build script body ##
     # This is the part that actually calls Plotly.js
@@ -324,7 +313,7 @@ def to_html(
             <div id="{id}" class="plotly-graph-div" \
 style="height:100%; width:100%;"></div>\
             <script>\
-                window.PLOTLYENV=window.PLOTLYENV || {{}};{base_url_line}\
+                window.PLOTLYENV=window.PLOTLYENV || {{}};\
                 {script};\
             </script>\
         </div>""".format(
@@ -333,7 +322,6 @@ def to_html(
         id=plotdivid,
         width=div_width,
         height=div_height,
-        base_url_line=base_url_line,
         script=script,
     ).strip()
 

plotly/offline/offline.py

@@ -156,35 +156,9 @@ def _get_jconfig(config=None):
     else:
         clean_config = {}
 
-    plotly_platform_url = tools.get_config_plotly_server_url()
-
-    if not clean_config.get("plotlyServerURL", None):
-        clean_config["plotlyServerURL"] = plotly_platform_url
-
-    if (
-        plotly_platform_url != "https://plot.ly"
-        and clean_config.get("linkText", None) == "Export to plot.ly"
-    ):
-        link_domain = plotly_platform_url.replace("https://", "").replace("http://", "")
-        link_text = clean_config["linkText"].replace("plot.ly", link_domain)
-        clean_config["linkText"] = link_text
-
     return clean_config
 
 
-# Build script to set global PlotlyConfig object. This must execute before
-# plotly.js is loaded.
-_window_plotly_config = """\
-<script>\
-window.PlotlyConfig = {MathJaxConfig: 'local'};\
-</script>"""
-
-_mathjax_config = """\
-<script>\
-if (window.MathJax && window.MathJax.Hub && window.MathJax.Hub.Config) {window.MathJax.Hub.Config({SVG: {font: "STIX-Web"}});}\
-</script>"""
-
-
 def get_image_download_script(caller):
     """
     This function will return a script that will download an image of a Plotly
@@ -286,8 +260,6 @@ def init_notebook_mode(connected=False):
 
 def iplot(
     figure_or_data,
-    show_link=False,
-    link_text="Export to plot.ly",
     validate=True,
     image=None,
     filename="plot_image",
@@ -306,10 +278,6 @@ def iplot(
                       graph descriptions.
 
     Keyword arguments:
-    show_link (default=False) -- display a link in the bottom-right corner of
-                                of the chart that will export the chart to
-                                Plotly Cloud or Plotly Enterprise
-    link_text (default='Export to plot.ly') -- the text of export link
     validate (default=True) -- validate that all of the keys in the figure
                                are valid? omit if your version of plotly.js
                                has become outdated with your version of
@@ -325,9 +293,7 @@ def iplot(
         will be saved to. The extension should not be included.
     image_height (default=600) -- Specifies the height of the image in `px`.
     image_width (default=800) -- Specifies the width of the image in `px`.
-    config (default=None) -- Plot view options dictionary. Keyword arguments
-        `show_link` and `link_text` set the associated options in this
-        dictionary if it doesn't contain them already.
+    config (default=None) -- Plot view options dictionary.
     auto_play (default=True) -- Whether to automatically start the animation
         sequence on page load, if the figure contains frames. Has no effect if
         the figure does not contain frames.
@@ -364,14 +330,12 @@ def iplot(
     """
     import plotly.io as pio
 
+    config = dict(config) if config else {}
+
     ipython = get_module("IPython")
     if not ipython:
         raise ImportError("`iplot` can only run inside an IPython Notebook.")
 
-    config = dict(config) if config else {}
-    config.setdefault("showLink", show_link)
-    config.setdefault("linkText", link_text)
-
     # Get figure
     figure = tools.return_figure_from_figure_or_data(figure_or_data, validate)
 
@@ -393,8 +357,6 @@ def iplot(
 
 def plot(
     figure_or_data,
-    show_link=False,
-    link_text="Export to plot.ly",
     validate=True,
     output_type="file",
     include_plotlyjs=True,
@@ -430,10 +392,6 @@ def plot(
                       graph descriptions.
 
     Keyword arguments:
-    show_link (default=False) -- display a link in the bottom-right corner of
-        of the chart that will export the chart to Plotly Cloud or
-        Plotly Enterprise
-    link_text (default='Export to plot.ly') -- the text of export link
     validate (default=True) -- validate that all of the keys in the figure
         are valid? omit if your version of plotly.js has become outdated
         with your version of graph_reference.json or if you need to include
@@ -499,9 +457,7 @@ def plot(
         image will be saved to. The extension should not be included.
     image_height (default=600) -- Specifies the height of the image in `px`.
     image_width (default=800) -- Specifies the width of the image in `px`.
-    config (default=None) -- Plot view options dictionary. Keyword arguments
-        `show_link` and `link_text` set the associated options in this
-        dictionary if it doesn't contain them already.
+    config (default=None) -- Plot view options dictionary.
     include_mathjax (False | 'cdn' | path - default=False) --
         Specifies how the MathJax.js library is included in the output html
         file or div string.  MathJax is required in order to display labels
@@ -544,6 +500,8 @@ def plot(
     """
     import plotly.io as pio
 
+    config = dict(config) if config else {}
+
     # Output type
     if output_type not in ["div", "file"]:
         raise ValueError(
@@ -557,11 +515,6 @@ def plot(
         )
         filename += ".html"
 
-    # Config
-    config = dict(config) if config else {}
-    config.setdefault("showLink", show_link)
-    config.setdefault("linkText", link_text)
-
     figure = tools.return_figure_from_figure_or_data(figure_or_data, validate)
     width = figure.get("layout", {}).get("width", "100%")
     height = figure.get("layout", {}).get("height", "100%")
@@ -608,8 +561,6 @@ def plot_mpl(
     resize=False,
     strip_style=False,
     verbose=False,
-    show_link=False,
-    link_text="Export to plot.ly",
     validate=True,
     output_type="file",
     include_plotlyjs=True,
@@ -635,10 +586,6 @@ def plot_mpl(
     resize (default=False) -- allow plotly to choose the figure size.
     strip_style (default=False) -- allow plotly to choose style options.
     verbose (default=False) -- print message.
-    show_link (default=False) -- display a link in the bottom-right corner of
-        of the chart that will export the chart to Plotly Cloud or
-        Plotly Enterprise
-    link_text (default='Export to plot.ly') -- the text of export link
     validate (default=True) -- validate that all of the keys in the figure
         are valid? omit if your version of plotly.js has become outdated
         with your version of graph_reference.json or if you need to include
@@ -692,8 +639,6 @@ def plot_mpl(
     plotly_plot = tools.mpl_to_plotly(mpl_fig, resize, strip_style, verbose)
     return plot(
         plotly_plot,
-        show_link,
-        link_text,
         validate,
         output_type,
         include_plotlyjs,
@@ -711,8 +656,6 @@ def iplot_mpl(
     resize=False,
     strip_style=False,
     verbose=False,
-    show_link=False,
-    link_text="Export to plot.ly",
     validate=True,
     image=None,
     image_filename="plot_image",
@@ -738,10 +681,6 @@ def iplot_mpl(
     resize (default=False) -- allow plotly to choose the figure size.
     strip_style (default=False) -- allow plotly to choose style options.
     verbose (default=False) -- print message.
-    show_link (default=False) -- display a link in the bottom-right corner of
-                                of the chart that will export the chart to
-                                Plotly Cloud or Plotly Enterprise
-    link_text (default='Export to plot.ly') -- the text of export link
     validate (default=True) -- validate that all of the keys in the figure
                                are valid? omit if your version of plotly.js
                                has become outdated with your version of
@@ -775,8 +714,6 @@ def iplot_mpl(
     plotly_plot = tools.mpl_to_plotly(mpl_fig, resize, strip_style, verbose)
     return iplot(
         plotly_plot,
-        show_link,
-        link_text,
         validate,
         image=image,
         filename=image_filename,
@@ -789,8 +726,6 @@ def enable_mpl_offline(
     resize=False,
     strip_style=False,
     verbose=False,
-    show_link=False,
-    link_text="Export to plot.ly",
     validate=True,
 ):
     """
@@ -826,7 +761,5 @@ def enable_mpl_offline(
     formatter = ip.display_formatter.formatters["text/html"]
     formatter.for_type(
         matplotlib.figure.Figure,
-        lambda fig: iplot_mpl(
-            fig, resize, strip_style, verbose, show_link, link_text, validate
-        ),
+        lambda fig: iplot_mpl(fig, resize, strip_style, verbose, validate),
     )

plotly/tools.py

@@ -602,30 +602,3 @@ def create_trisurf(*args, **kwargs):
         from plotly.figure_factory import create_trisurf
 
         return create_trisurf(*args, **kwargs)
-
-
-def get_config_plotly_server_url():
-    """
-    Function to get the .config file's 'plotly_domain' without importing
-    the chart_studio package.  This property is needed to compute the default
-    value of the plotly.js config plotlyServerURL, so it is independent of
-    the chart_studio integration and still needs to live in
-
-    Returns
-    -------
-    str
-    """
-    config_file = os.path.join(PLOTLY_DIR, ".config")
-    default_server_url = "https://plot.ly"
-    if not os.path.exists(config_file):
-        return default_server_url
-    with open(config_file, "rt") as f:
-        try:
-            config_dict = json.load(f)
-            if not isinstance(config_dict, dict):
-                config_dict = {}
-        except Exception:
-            # TODO: issue a warning and bubble it up
-            config_dict = {}
-
-    return config_dict.get("plotly_domain", default_server_url)

tests/test_core/test_offline/test_offline.py

@@ -281,14 +281,12 @@ def test_div_output(self):
         self.assertTrue(html.startswith("<div") and html.endswith("</div>"))
 
     def test_config(self):
-        config = dict(linkText="Plotly rocks!", showLink=True, editable=True)
+        config = dict(editable=True)
         html = self._read_html(
             plotly.offline.plot(
                 fig, config=config, auto_open=False, filename=html_filename
             )
         )
-        self.assertIn('"linkText": "Plotly rocks!"', html)
-        self.assertIn('"showLink": true', html)
         self.assertIn('"editable": true', html)
 
     def test_config_bad_options(self):

tests/test_io/test_renderers.py

@@ -96,8 +96,6 @@ def test_plotly_mimetype_renderer_mimetype(fig1, renderer):
     pio.renderers.default = renderer
     expected = {plotly_mimetype: json.loads(pio.to_json(fig1, remove_uids=False))}
 
-    expected[plotly_mimetype]["config"] = {"plotlyServerURL": "https://plot.ly"}
-
     pio.renderers.render_on_display = False
 
     with mock.patch("IPython.display.display") as mock_display:
@@ -117,8 +115,6 @@ def test_plotly_mimetype_renderer_show(fig1, renderer):
     pio.renderers.default = renderer
     expected = {plotly_mimetype: json.loads(pio.to_json(fig1, remove_uids=False))}
 
-    expected[plotly_mimetype]["config"] = {"plotlyServerURL": "https://plot.ly"}
-
     with mock.patch("IPython.display.display") as mock_display:
         pio.show(fig1)