🐮

Author: chriddyp

plotly/files.py

@@ -20,8 +20,8 @@
                               'plotly_ssl_verification': True,
                               'plotly_proxy_authorization': False,
                               'world_readable': True,
-                              'sharing': "public",
-                              "auto_open": True}}
+                              'sharing': 'public',
+                              'auto_open': True}}
 
 try:
     os.mkdir(TEST_DIR)

plotly/plotly/plotly.py

@@ -100,33 +100,17 @@ def _plot_option_logic(plot_options_from_call_signature):
                        session_options, file_options]:
         utils.validate_world_readable_and_sharing_settings(option_set)
         utils.set_sharing_and_world_readable(option_set)
+
         # dynamic defaults
         if ('filename' in option_set and
                 'fileopt' not in option_set):
             option_set['fileopt'] = 'overwrite'
 
-    # merge options together with precedence
-    def update_plot_options(base_plot_options, new_plot_options):
-        """
-        Merge new_plot_options into base_plot_options
-
-        """
-        updated_plot_options = {}
-        base_plot_options = copy.deepcopy(base_plot_options)
-        new_plot_options = copy.deepcopy(new_plot_options)
-        for key in base_plot_options:
-            updated_plot_options[key] = new_plot_options.get(
-                key, base_plot_options[key])
-
-        return updated_plot_options
-
-    user_plot_options = default_plot_options
-    user_plot_options = update_plot_options(user_plot_options,
-                                            file_options)
-    user_plot_options = update_plot_options(user_plot_options,
-                                            session_options)
-    user_plot_options = update_plot_options(user_plot_options,
-                                            plot_options_from_call_signature)
+    user_plot_options = {}
+    user_plot_options.update(default_plot_options)
+    user_plot_options.update(file_options)
+    user_plot_options.update(session_options)
+    user_plot_options.update(plot_options_from_call_signature)
 
     return user_plot_options
 

plotly/tests/test_core/test_plotly/test_plot.py

@@ -7,16 +7,16 @@
 """
 from __future__ import absolute_import
 
+import json
 import requests
 import six
-import json
 
 from unittest import TestCase
 from nose.plugins.attrib import attr
 from nose.tools import raises
 
-from plotly.tests.utils import PlotlyTestCase
 import plotly.tools as tls
+from plotly.tests.utils import PlotlyTestCase
 from plotly.plotly import plotly as py
 from plotly.exceptions import PlotlyError, PlotlyEmptyDataError
 from plotly.files import CONFIG_FILE
@@ -214,7 +214,7 @@ def test_private_plot_response_with_and_without_share_key(self):
 
 class TestPlotOptionLogic(PlotlyTestCase):
     conflicting_option_set = (
-        {'world_readable': True, 'sharing': 'secret', },
+        {'world_readable': True, 'sharing': 'secret'},
         {'world_readable': True, 'sharing': 'private'},
         {'world_readable': False, 'sharing': 'public'}
     )