Merge pull request #422 from jdh2358/py24-compliance

mdboom · mdboom · commit 1283b4698a9d · 2011-08-17T06:11:42.000-07:00
fix some python2.4 compliance issues
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -108,7 +108,7 @@ class Line2D(Artist):
     markers = MarkerStyle.markers
     filled_markers = MarkerStyle.filled_markers
     fillStyles = MarkerStyle.fillstyles
-    
+
     zorder = 2
     validCap = ('butt', 'round', 'projecting')
     validJoin =   ('miter', 'round', 'bevel')
@@ -551,7 +551,7 @@ def draw(self, renderer):
                     renderer.draw_markers(
                         gc, alt_marker_path, alt_marker_trans, subsampled,
                         affine.frozen(), rgbFace)
-                    
+
             gc.restore()
 
         gc.restore()
@@ -747,9 +747,9 @@ def set_marker(self, marker):
         """
         try:
             self._marker.set_marker(marker)
-        except ValueError as e:
+        except ValueError,e:
             verbose.report(str(e))
-        
+
     def set_markeredgecolor(self, ec):
         """
         Set the marker edge color
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -578,7 +578,7 @@ def render_figures(code, code_path, output_dir, output_base, context,
             for format, dpi in formats:
                 try:
                     figman.canvas.figure.savefig(img.filename(format), dpi=dpi)
-                except exceptions.BaseException as err:
+                except Exception,err:
                     raise PlotError(traceback.format_exc())
                 img.formats.append(format)
 
