Maintain dict type in components() (bokeh#8416)

* Maintain dict type in components()

* Single return point in components()

Author: mattpap

bokeh/embed/standalone.py

@@ -209,8 +209,10 @@ def components(models, wrap_script=True, wrap_plot_info=True, theme=FromCurdoc):
 
     # now convert dict to list, saving keys in the same order
     model_keys = None
+    dict_type = None
     if isinstance(models, dict):
         model_keys = models.keys()
+        dict_type = models.__class__
         values = []
         # don't just use .values() to ensure we are in the same order as key list
         for k in model_keys:
@@ -238,14 +240,13 @@ def div_for_root(root):
     # 3) convert back to the input shape
 
     if was_single_object:
-        return script, results[0]
+        result = results[0]
     elif model_keys is not None:
-        result = {}
-        for (key, value) in zip(model_keys, results):
-            result[key] = value
-        return script, result
+        result = dict_type(zip(model_keys, results))
     else:
-        return script, tuple(results)
+        result = tuple(results)
+
+    return script, result
 
 def file_html(models,
               resources,

bokeh/embed/tests/test_standalone.py

@@ -19,6 +19,7 @@
 
 # Standard library imports
 from mock import patch
+from collections import OrderedDict
 
 # External imports
 import bs4
@@ -95,6 +96,10 @@ def test_return_type(self):
         assert isinstance(divs, dict)
         assert all(isinstance(x, string_types) for x in divs.keys())
 
+        _, divs = bes.components(OrderedDict([("Plot 1", plot1), ("Plot 2", plot2)]))
+        assert isinstance(divs, OrderedDict)
+        assert all(isinstance(x, string_types) for x in divs.keys())
+
     @patch('bokeh.embed.util.make_globally_unique_id', new_callable=lambda: stable_id)
     def test_plot_dict_returned_when_wrap_plot_info_is_false(self, mock_make_id):
         doc = Document()