changed kwargs to a single parameter

yankev · yankev · commit f0e7be4af28a · 2016-04-15T11:20:28.000-04:00
diff --git a/plotly/offline/offline.py b/plotly/offline/offline.py
@@ -73,7 +73,7 @@ def init_notebook_mode():
 
 
 def _plot_html(figure_or_data, show_link, link_text,
-               validate, default_width, default_height, **kwargs):
+               validate, default_width, default_height, global_requirejs):
 
     figure = tools.return_figure_from_figure_or_data(figure_or_data, validate)
 
@@ -121,15 +121,9 @@ def _plot_html(figure_or_data, show_link, link_text,
         layout=jlayout,
         config=jconfig)
 
-    if kwargs and kwargs['browser']:
-        nb = False        # function was not called from a notebook
-    else:
-        nb = True
-
-    # evaluate whether or not to include lines based on the nb
-
-    optional_line1 = 'require(["plotly"], function(Plotly) {{ ' if nb else ''
-    optional_line2 = '}});' if nb else ''
+    optional_line1 = ('require(["plotly"], function(Plotly) {{ '
+                      if global_requirejs else '')
+    optional_line2 = '}});' if global_requirejs else ''
 
     plotly_html_div = (
         ''
@@ -199,7 +193,7 @@ def iplot(figure_or_data, show_link=True, link_text='Export to plot.ly',
 
     plot_html, plotdivid, width, height = _plot_html(
         figure_or_data, show_link, link_text, validate,
-        '100%', 525)
+        '100%', 525, global_requirejs=True)
 
     display(HTML(plot_html))
 
@@ -268,7 +262,7 @@ def plot(figure_or_data,
 
     plot_html, plotdivid, width, height = _plot_html(
         figure_or_data, show_link, link_text, validate,
-        '100%', '100%', browser=True)
+        '100%', '100%', global_requirejs=False)
 
     resize_script = ''
     if width == '100%' or height == '100%':
