Moved tests from cbook to tests_cbook

NelleV · NelleV · commit 2c31f97babcd · 2013-02-01T10:31:43.000+01:00
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -77,7 +77,7 @@ def unicode_safe(s):
             return unicode(s, preferredencoding)
 
 
-class converter:
+class converter(object):
     """
     Base class for handling string -> python type with support for
     missing values
@@ -580,7 +580,8 @@ def get_sample_data(fname, asfileobj=True):
     if matplotlib.rcParams['examples.directory']:
         root = matplotlib.rcParams['examples.directory']
     else:
-        root = os.path.join(os.path.dirname(__file__), "mpl-data", "sample_data")
+        root = os.path.join(os.path.dirname(__file__),
+                            "mpl-data", "sample_data")
     path = os.path.join(root, fname)
 
     if asfileobj:
@@ -1820,11 +1821,3 @@ def _check_output(*popenargs, **kwargs):
     check_output = subprocess.check_output
 else:
     check_output = _check_output
-
-
-if __name__ == '__main__':
-    assert(allequal([1, 1, 1]))
-    assert(not allequal([1, 1, 0]))
-    assert(allequal([]))
-    assert(allequal(('a', 'a')))
-    assert(not allequal(('a', 'b')))
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
@@ -78,3 +78,9 @@ def test_rgba(self):
         assert_array_equal(actual[1], expected[1])
 
 
+def test_allequal():
+    assert(cbook.allequal([1, 1, 1]))
+    assert(not cbook.allequal([1, 1, 0]))
+    assert(cbook.allequal([]))
+    assert(cbook.allequal(('a', 'a')))
+    assert(not cbook.allequal(('a', 'b')))
