minor test fixes for ipyplotly_integration

plotly/plotly/plotly.py

@@ -474,7 +474,7 @@ def get_figure(file_owner_or_url, file_id=None, raw=False):
 
     if raw:
         return figure
-    return tools.get_valid_graph_obj(figure, obj_type='Figure')
+    return tools.get_graph_obj(figure, obj_type='Figure')
 
 
 @utils.template_doc(**tools.get_config_file())

plotly/tests/test_core/test_get_figure/test_get_figure.py

@@ -42,15 +42,15 @@ class GetFigureTest(PlotlyTestCase):
     def test_get_figure(self):
         un = 'PlotlyImageTest'
         ak = '786r5mecv0'
-        file_id = 2
+        file_id = 13183
         py.sign_in(un, ak)
         py.get_figure('PlotlyImageTest', str(file_id))
 
     @attr('slow')
     def test_get_figure_with_url(self):
         un = 'PlotlyImageTest'
         ak = '786r5mecv0'
-        url = "https://plot.ly/~PlotlyImageTest/2/"
+        url = "https://plot.ly/~PlotlyImageTest/13183/"
         py.sign_in(un, ak)
         py.get_figure(url)
 
@@ -71,6 +71,15 @@ def test_get_figure_invalid_2(self):
         with self.assertRaises(exceptions.PlotlyError):
             py.get_figure(url)
 
+    # demonstrates error if fig has invalid parts
+    def test_get_figure_invalid_3(self):
+        un = 'PlotlyImageTest'
+        ak = '786r5mecv0'
+        url = "https://plot.ly/~PlotlyImageTest/2/"
+        py.sign_in(un, ak)
+        with self.assertRaises(ValueError):
+            py.get_figure(url)
+
     @attr('slow')
     def test_get_figure_does_not_exist(self):
         un = 'PlotlyImageTest'
@@ -95,6 +104,6 @@ class TestBytesVStrings(TestCase):
     def test_proper_escaping(self):
         un = 'PlotlyImageTest'
         ak = '786r5mecv0'
-        url = "https://plot.ly/~PlotlyImageTest/91/"
+        url = "https://plot.ly/~PlotlyImageTest/13185/"
         py.sign_in(un, ak)
         py.get_figure(url)

plotly/tools.py

@@ -1351,23 +1351,22 @@ def _pad(s, cell_len=cell_len):
     return fig
 
 
-def get_valid_graph_obj(obj, obj_type=None):
-    """Returns a new graph object that won't raise.
-
-    CAREFUL: this will *silently* strip out invalid pieces of the object.
+def get_graph_obj(obj, obj_type=None):
+    """Returns a new graph object.
 
+    OLD FUNCTION: this will *silently* strip out invalid pieces of the object.
+    NEW FUNCTION: no striping of invalid pieces anymore - only raises error
+        on unrecognized graph_objs
     """
     # TODO: Deprecate or move. #283
     from plotly.graph_objs import graph_objs
     try:
-        print(graph_objs)
-        print(obj_type)
         cls = getattr(graph_objs, obj_type)
     except (AttributeError, KeyError):
         raise exceptions.PlotlyError(
             "'{}' is not a recognized graph_obj.".format(obj_type)
         )
-    return cls(obj, _raise=False)
+    return cls(obj)
 
 
 def validate(obj, obj_type):