BUG: fixed cbook tests for Python 2.6

phobson · phobson · commit 91f88a277100 · 2014-01-12T20:27:10.000-08:00
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
@@ -6,9 +6,9 @@
 from datetime import datetime
 
 import numpy as np
-from numpy.testing.utils import assert_array_equal, assert_approx_equal, \
-                                assert_array_almost_equal
-from nose.tools import assert_equal, raises, assert_true, assert_list_equal
+from numpy.testing.utils import (assert_array_equal, assert_approx_equal,
+                                 assert_array_almost_equal)
+from nose.tools import assert_equal, raises, assert_true
 
 import matplotlib.cbook as cbook
 import matplotlib.colors as mcolors
@@ -100,7 +100,7 @@ def setup(self):
         np.random.seed(937)
         self.nrows = 37
         self.ncols = 4
-        self.data = x = np.random.lognormal(size=(self.nrows, self.ncols),
+        self.data = np.random.lognormal(size=(self.nrows, self.ncols),
                                             mean=1.5, sigma=1.75)
         self.known_keys = sorted([
             'mean', 'med', 'q1', 'q3', 'iqr',
@@ -145,9 +145,8 @@ def test_form_each_dict(self):
     def test_form_dict_keys(self):
         for res in self.std_results:
             keys = sorted(list(res.keys()))
-            assert_list_equal(keys, self.known_keys)
-            #for key in keys:
-            #    assert_true(key in self.known_keys)
+            for key in keys:
+                assert_true(key in self.known_keys)
 
     def test_results_baseline(self):
         res = self.std_results[0]
