fix some code that breaks python 2.4

jdh2358 · jdh2358 · commit 8c7361d91b1a · 2010-07-06T01:24:58.000Z
svn path=/trunk/matplotlib/; revision=8499
diff --git a/examples/api/hinton_demo.py b/examples/api/hinton_demo.py
@@ -8,7 +8,7 @@
 
 def hinton(W, maxWeight=None, ax=None):
     """
-    Draws a Hinton diagram for visualizing a weight matrix. 
+    Draws a Hinton diagram for visualizing a weight matrix.
     """
     if not ax:
         fig = plt.figure()
@@ -23,13 +23,14 @@ def hinton(W, maxWeight=None, ax=None):
     ax.yaxis.set_major_locator(NullLocator())
 
     for (x,y),w in np.ndenumerate(W):
-        color = 'white' if w > 0 else 'black'
+        if w > 0: color = 'white'
+        else:     color = 'black'
         size = np.sqrt(np.abs(w))
         rect = Rectangle([x - size / 2, y - size / 2], size, size,
             facecolor=color, edgecolor=color)
         ax.add_patch(rect)
     ax.autoscale_view()
-    
+
     # Reverse the yaxis limits
     ax.set_ylim(*ax.get_ylim()[::-1])
 
diff --git a/lib/mpl_toolkits/axisartist/angle_helper.py b/lib/mpl_toolkits/axisartist/angle_helper.py
@@ -179,7 +179,9 @@ class FormatterHMS(object):
     def __call__(self, direction, factor, values): # hour
         if len(values) == 0:
             return []
-        ss = [[-1, 1][v>0] for v in values]
+        #ss = [[-1, 1][v>0] for v in values]  #not py24 compliant
+        values = np.asarray(values)
+        ss = np.where(values>0, 1, -1)
         values = np.abs(values)/15.
 
         if factor == 1:
@@ -221,7 +223,9 @@ class FormatterDMS(object):
     def __call__(self, direction, factor, values):
         if len(values) == 0:
             return []
-        ss = [[-1, 1][v>0] for v in values]
+        #ss = [[-1, 1][v>0] for v in values] #not py24 compliant
+        values = np.asarray(values)
+        ss = np.where(values>0, 1, -1)
         values = np.abs(values)
         if factor == 1:
             return ["$%d^{\circ}$" % (s*int(v),) for (s, v) in zip(ss, values)]
