prettify tests and update imports

plotly · theengineear · Jul 7, 2015 · Jul 7, 2015 · Jul 7, 2015 · Jul 7, 2015
commit fce9ba33d288cb67c03b55d9fad2c343161c4bcc
diff --git a/plotly/tests/test_core/test_get_figure/__init__.py b/plotly/tests/test_core/test_get_figure/__init__.py
@@ -1,6 +0,0 @@
-def setup_package():
-    pass
-
-
-def teardown_package():
-    pass

diff --git a/plotly/tests/test_core/test_get_figure/test_get_figure.py b/plotly/tests/test_core/test_get_figure/test_get_figure.py
@@ -5,16 +5,16 @@
 A module intended for use with Nose.
 
 """
-from plotly.graph_objs import graph_objs
-from plotly.plotly import plotly as py
-from plotly import exceptions
-from nose.tools import raises
-import six
+from __future__ import absolute_import
 
-from unittest import TestCase
+from unittest import TestCase, skipIf
 
-version = six.sys.version_info[:2]  # need this for conditional testing
+from nose.tools import raises
+import six
 
+from plotly import exceptions
+from plotly.graph_objs import graph_objs
+from plotly.plotly import plotly as py
 
 # username for tests: 'plotlyimagetest'
 # api_key for account: '786r5mecv0'
@@ -53,8 +53,9 @@ def compare_with_raw(obj, raw_obj, parents=None):
         for entry, entry_raw in zip(obj, raw_obj):
             if isinstance(entry, (dict, list)):
                 try:
-                    coll_name = graph_objs.NAME_TO_KEY[entry.__class__
-                        .__name__]
+                    coll_name = (
+                        graph_objs.NAME_TO_KEY[entry.__class__.__name__]
+                    )
                 except KeyError:
                     coll_name = entry.__class__.__name__
                 if parents is None:
@@ -163,7 +164,7 @@ def test_all():
     ak = '786r5mecv0'
     run_test = False
     end_file = 2
-    polar_plots = [], #[6, 7, 8]
+    polar_plots = [],  # [6, 7, 8]
     skip = list(range(0))
     if run_test:
         py.sign_in(un, ak)
@@ -198,18 +199,12 @@ def test_all():
 
 class TestBytesVStrings(TestCase):
 
-    # unittest `skipIf` not supported in 2.6
-    if version < (2, 7) or (2, 7) < version < (3, 3):
-        pass
-    else:
-        from unittest import skipIf
-
-        @skipIf(not six.PY3, 'Decoding and missing escapes only seen in PY3')
-        def test_proper_escaping(self):
-            un = 'PlotlyImageTest'
-            ak = '786r5mecv0'
-            url = "https://plot.ly/~PlotlyImageTest/91/"
-            py.sign_in(un, ak)
-            print("getting: https://plot.ly/~PlotlyImageTest/91/")
-            print("###########################################\n\n")
-            fig = py.get_figure(url)
+    @skipIf(not six.PY3, 'Decoding and missing escapes only seen in PY3')
+    def test_proper_escaping(self):
+        un = 'PlotlyImageTest'
+        ak = '786r5mecv0'
+        url = "https://plot.ly/~PlotlyImageTest/91/"
+        py.sign_in(un, ak)
+        print("getting: https://plot.ly/~PlotlyImageTest/91/")
+        print("###########################################\n\n")
+        fig = py.get_figure(url)
diff --git a/plotly/tests/test_core/test_get_requests/__init__.py b/plotly/tests/test_core/test_get_requests/__init__.py
@@ -1,6 +0,0 @@
-def setup_package():
-    pass
-
-
-def teardown_package():
-    pass

diff --git a/plotly/tests/test_core/test_get_requests/test_get_requests.py b/plotly/tests/test_core/test_get_requests/test_get_requests.py
@@ -5,16 +5,12 @@
 A module intended for use with Nose.
 
 """
-
-import requests
 import copy
+import json
+import requests
+
 import six
-import sys
 
-if sys.version[:3] == '2.6':
-    import simplejson as json
-else:
-    import json
 
 default_headers = {'plotly-username': '',
                    'plotly-apikey': '',
@@ -151,4 +147,3 @@ def test_valid_request():
     # if figure['data'][0]['x'] != [u'1', u'2', u'3']:
     #     print('ERROR')
     # return res
-
diff --git a/plotly/tests/test_core/test_graph_objs/__init__.py b/plotly/tests/test_core/test_graph_objs/__init__.py
@@ -1,7 +1,5 @@
-def setup_package():
-    import warnings
-    warnings.filterwarnings('ignore')
+import warnings
 
 
-def teardown_package():
-    pass
+def setup_package():
+    warnings.filterwarnings('ignore')
diff --git a/plotly/tests/test_core/test_graph_objs/nose_tools.py b/plotly/tests/test_core/test_graph_objs/nose_tools.py
@@ -1,10 +1,12 @@
 from __future__ import absolute_import
 
+from numbers import Number as Num
+
 import matplotlib
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use('Agg')
+
 from plotly.matplotlylib import Exporter, PlotlyRenderer
-from numbers import Number as Num
 
 
 def compare_dict(dict1, dict2, equivalent=True, msg='', tol=10e-8):

diff --git a/plotly/tests/test_core/test_graph_objs/test_annotations.py b/plotly/tests/test_core/test_graph_objs/test_annotations.py
@@ -8,12 +8,11 @@
 from __future__ import absolute_import
 
 from nose.tools import raises
-from plotly.graph_objs import *
-from plotly.exceptions import (PlotlyError,
-                               PlotlyDictKeyError,
-                               PlotlyDictValueError,
-                               PlotlyDataTypeError,
-                               PlotlyListEntryError)
+
+from plotly.exceptions import (PlotlyError, PlotlyDictKeyError,
+                               PlotlyDictValueError, PlotlyListEntryError)
+from plotly.graph_objs import Annotation, Annotations, Data, Figure, Layout
+
 
 
 def setup():
@@ -69,7 +68,7 @@ def test_validate():
     annotations.validate()
     annotations += [{'text': 'some text'}]
     annotations.validate()
-    annotations += [{},{},{}]
+    annotations += [{}, {}, {}]
     annotations.validate()
 
 
@@ -78,4 +77,3 @@ def test_validate_error():
     annotations = Annotations()
     annotations.append({'not-a-key': 'anything'})
     annotations.validate()
-
diff --git a/plotly/tests/test_core/test_graph_objs/test_append_trace.py b/plotly/tests/test_core/test_graph_objs/test_append_trace.py
@@ -1,39 +1,39 @@
-import plotly
-from plotly.graph_objs import *
-import plotly.tools as tls
+from __future__ import absolute_import
+
 from nose.tools import raises
 
+from plotly.graph_objs import (Data, Figure, Layout, Scatter, Scatter3d, Scene,
+                               XAxis, YAxis)
+import plotly.tools as tls
+
 
 @raises(Exception)
 def test_print_grid_before_make_subplots():
+    fig = Figure()
     fig.print_grid()
 
+
 @raises(Exception)
 def test_append_trace_before_make_subplots():
-    trace = Scatter(
-           x=[1,2,3],
-           y=[2,3,4]
-    )
+    trace = Scatter(x=[1, 2, 3], y=[2, 3, 4])
+    fig = Figure()
     fig.append_trace(trace, 2, 2)
 
+
 @raises(Exception)
 def test_append_trace_row_out_of_range():
-    trace = Scatter(
-           x=[1,2,3],
-           y=[2,3,4]
-    )
+    trace = Scatter(x=[1, 2, 3], y=[2, 3, 4])
     fig = tls.make_subplots(rows=2, cols=3)
     fig.append_trace(trace, 10, 2)
 
+
 @raises(Exception)
 def test_append_trace_col_out_of_range():
-    trace = Scatter(
-           x=[1,2,3],
-           y=[2,3,4]
-    )
+    trace = Scatter(x=[1, 2, 3], y=[2, 3, 4])
     fig = tls.make_subplots(rows=2, cols=3)
     fig.append_trace(trace, 2, 0)
 
+
 def test_append_scatter():
     expected = Figure(
         data=Data([
@@ -96,34 +96,28 @@ def test_append_scatter():
         )
     )
 
-    trace = Scatter(
-           x=[1,2,3],
-           y=[2,3,4]
-    )
+    trace = Scatter(x=[1, 2, 3], y=[2, 3, 4])
     fig = tls.make_subplots(rows=2, cols=3)
     fig.append_trace(trace, 2, 2)
     assert fig == expected
 
+
 @raises(Exception)
 def test_append_scatter_after_deleting_xaxis():
-    trace = Scatter(
-           x=[1,2,3],
-           y=[2,3,4]
-    )
+    trace = Scatter(x=[1, 2, 3], y=[2, 3, 4])
     fig = tls.make_subplots(rows=2, cols=3)
     fig['layout'].pop('xaxis5', None)
     fig.append_trace(trace, 2, 2)
 
+
 @raises(Exception)
 def test_append_scatter_after_deleting_yaxis():
-    trace = Scatter(
-           x=[1,2,3],
-           y=[2,3,4]
-    )
+    trace = Scatter(x=[1, 2, 3], y=[2, 3, 4])
     fig = tls.make_subplots(rows=2, cols=3)
     fig['layout'].pop('yaxis5', None)
     fig.append_trace(trace, 2, 2)
 
+
 def test_append_scatter3d():
     expected = Figure(
         data=Data([
@@ -153,24 +147,17 @@ def test_append_scatter3d():
     fig = tls.make_subplots(rows=2, cols=1,
                             specs=[[{'is_3d': True}], 
                                    [{'is_3d': True}]])
-    trace = Scatter3d(
-           x=[1,2,3],
-           y=[2,3,4],
-           z=[1,2,3]
-    )
+    trace = Scatter3d(x=[1, 2, 3], y=[2, 3, 4], z=[1, 2, 3])
     fig.append_trace(trace, 1, 1)
     fig.append_trace(trace, 2, 1)
     assert fig == expected
 
+
 @raises(Exception)
 def test_append_scatter3d_after_deleting_scene():
     fig = tls.make_subplots(rows=2, cols=1,
                             specs=[[{'is_3d': True}], 
                                    [{'is_3d': True}]])
-    trace = Scatter3d(
-           x=[1,2,3],
-           y=[2,3,4],
-           z=[1,2,3]
-    )
+    trace = Scatter3d(x=[1, 2, 3], y=[2, 3, 4], z=[1, 2, 3])
     fig['layout'].pop('scene1', None)
     fig.append_trace(trace, 1, 1)
diff --git a/plotly/tests/test_core/test_graph_objs/test_consistency.py b/plotly/tests/test_core/test_graph_objs/test_consistency.py
@@ -6,6 +6,8 @@
 are properly defined in both graph_objs.py and included in the mapping dicts.
 
 """
+from __future__ import absolute_import
+
 from plotly.graph_objs import graph_objs
 
 

diff --git a/plotly/tests/test_core/test_graph_objs/test_data.py b/plotly/tests/test_core/test_graph_objs/test_data.py
@@ -8,12 +8,11 @@
 from __future__ import absolute_import
 
 from nose.tools import raises
-from plotly.graph_objs import *
-from plotly.exceptions import (PlotlyError,
-                               PlotlyDictKeyError,
-                               PlotlyDictValueError,
-                               PlotlyDataTypeError,
+
+from plotly.exceptions import (PlotlyError, PlotlyDictKeyError,
+                               PlotlyDictValueError, PlotlyDataTypeError,
                                PlotlyListEntryError)
+from plotly.graph_objs import Annotations, Data, Figure, Layout
 
 
 def setup():
@@ -78,7 +77,7 @@ def test_validate():
     data.validate()
     data += [{'type': 'scatter'}]
     data.validate()
-    data += [{},{},{}]
+    data += [{}, {}, {}]
     data.validate()
 
 
@@ -87,4 +86,3 @@ def test_validate_error():
     data = Data()
     data.append({'not-a-key': 'anything'})
     data.validate()
-
diff --git a/plotly/tests/test_core/test_graph_objs/test_error_bars.py b/plotly/tests/test_core/test_graph_objs/test_error_bars.py
@@ -8,11 +8,8 @@
 from __future__ import absolute_import
 
 from nose.tools import raises
-from plotly.graph_objs import *
-from plotly.exceptions import (PlotlyDictKeyError,
-                               PlotlyDictValueError,
-                               PlotlyDataTypeError,
-                               PlotlyListEntryError)
+from plotly.graph_objs import ErrorX, ErrorY
+from plotly.exceptions import PlotlyDictKeyError
 
 
 def test_instantiate_error_x():

diff --git a/plotly/tests/test_core/test_graph_objs/test_get_data.py b/plotly/tests/test_core/test_graph_objs/test_get_data.py
@@ -2,7 +2,8 @@
 
 from unittest import TestCase
 
-from plotly.graph_objs import *
+from plotly.graph_objs import (Data, Figure, Layout, Line, Margin, Marker,
+                               Scatter, XAxis, YAxis)
 
 
 class TestGetData(TestCase):
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ @@
     are properly defined in both graph_objs.py and included in the mapping dicts.
     """
+    from __future__ import absolute_import
     from plotly.graph_objs import graph_objs
@@ Expand Down @@