Merge branch 'ipyplotly_integration' of https://github.com/plotly/plotly.py into ipyplotly_integration

Author: jonmmease

Diff for: plotly/figure_factory/_facet_grid.py

@@ -143,8 +143,8 @@ def _axis_title_annotation(text, x_or_y_axis):
 
 def _add_shapes_to_fig(fig, annot_rect_color, flipped_rows=False,
                        flipped_cols=False):
-    fig['layout']['shapes'] = []
-    for key in fig['layout'].keys():
+    shapes_list = []
+    for key in fig['layout'].to_plotly_json().keys():
         if 'axis' in key and fig['layout'][key]['domain'] != [0.0, 1.0]:
             shape = {
                'fillcolor': annot_rect_color,
@@ -163,7 +163,7 @@ def _add_shapes_to_fig(fig, annot_rect_color, flipped_rows=False,
 
                 if flipped_cols:
                     shape['y1'] += 0.5
-                fig['layout']['shapes'].append(shape)
+                shapes_list.append(shape)
 
             elif 'yaxis' in key:
                 shape['x0'] = 1.005
@@ -173,7 +173,9 @@ def _add_shapes_to_fig(fig, annot_rect_color, flipped_rows=False,
 
                 if flipped_rows:
                     shape['x1'] += 1
-                fig['layout']['shapes'].append(shape)
+                shapes_list.append(shape)
+
+    fig['layout']['shapes'] = shapes_list
 
 
 def _make_trace_for_scatter(trace, trace_type, color, **kwargs_marker):

Diff for: plotly/plotly/plotly.py

@@ -150,8 +150,14 @@ def iplot(figure_or_data, **plot_options):
         layout = {}
 
     embed_options = dict()
-    embed_options['width'] = layout.get('width', '100%')
-    embed_options['height'] = layout.get('height', 525)
+    try:
+        embed_options['width'] = layout.to_plotly_json().get('width', '100%')
+    except AttributeError:
+        embed_options['width'] = layout.get('width', '100%')
+    try:
+        embed_options['height'] = layout.to_plotly_json().get('height', 525)
+    except AttributeError:
+        embed_options['height'] = layout.get('height', 525)
     try:
         float(embed_options['width'])
     except (ValueError, TypeError):