Integrating minimum version check utility function into the rest of the code.

Author: alexras

Legend.py

@@ -1,5 +1,6 @@
 from Location import Location
 import warnings
+from Utils import _check_min_matplotlib_version
 
 class Legend(object):
     # Location, location, location!
@@ -17,11 +18,7 @@ def _genLegendKeywords(self, axes, handles, labels):
         legendKeywords = {}
 
         if self.columns > 1:
-            versionParts = [int(x) for x in matplotlib.__version__.split('.')]
-
-            (superMajor, major, minor) = versionParts[0:3]
-
-            if superMajor == 0 and major < 98:
+            if not _check_min_matplotlib_version(0, 98, 0):
                 warnings.warn("Number of columns support not available "
                               "in versions of matplotlib prior to 0.98")
             else:

Plot.py

@@ -11,7 +11,7 @@
 from boomslang_exceptions import BoomslangPlotConfigurationException
 from boomslang_exceptions import BoomslangPlotRenderingException
 
-from Utils import getGoldenRatioDimensions
+from Utils import getGoldenRatioDimensions, _check_min_matplotlib_version
 
 class Plot(object):
     """
@@ -510,15 +510,12 @@ def drawPlot(self, fig, ax):
         legendKeywords = {}
 
         if self.legendCols > 0:
-            versionParts = [int(x) for x in matplotlib.__version__.split('.')]
-
-            (superMajor, major, minor) = versionParts[0:3]
-
             if self.legendBboxToAnchor is not None:
                 legendKeywords["bbox_to_anchor"] = self.legendBboxToAnchor
 
-            if superMajor == 0 and major < 98:
-                print >>sys.stderr, "Number of columns support not available in versions of matplotlib prior to 0.98"
+            if _check_min_matplotlib_version(0, 98, 0):
+                print >>sys.stderr, "Number of columns support not available " \
+                    "in versions of matplotlib prior to 0.98"
             else:
                 legendKeywords["ncol"] = self.legendCols
                 legendKeywords["scatterpoints"] = self.scatterPoints
@@ -530,7 +527,8 @@ def drawPlot(self, fig, ax):
 
         if self.legend:
             if len(plotHandles) == 0:
-                print >>sys.stderr, "ERROR: Plot wanted to draw a legend, but none of its elements have labels"
+                print >>sys.stderr, "ERROR: Plot wanted to draw a legend, " \
+                    "but none of its elements have labels"
                 sys.exit(1)
 
             if self.twinxIndex > 0:

PlotLayout.py

@@ -6,7 +6,7 @@
 import warnings
 from boomslang_exceptions import BoomslangPlotRenderingException
 
-from Utils import getGoldenRatioDimensions
+from Utils import getGoldenRatioDimensions, _check_min_matplotlib_version
 
 class PlotLayout(object):
     def __init__(self):
@@ -239,7 +239,7 @@ def _doPlot(self):
             figLegendKeywords = {}
 
             if self.figLegendCols is not None:
-                if not self._check_min_matplotlib_version((0, 98, 0)):
+                if not self._check_min_matplotlib_version(0, 98, 0):
                     warnings.warn("Number of columns support not available in "
                                   "versions of matplotlib prior to 0.98")
                 else:
@@ -265,15 +265,6 @@ def _doPlot(self):
     def _plot_subplot(self, plot, fig, rows, cols, pos, projection):
         return plot.subplot(fig, rows, cols, pos, projection)
 
-    def _check_min_matplotlib_version(self, version):
-        versionPieces = [int(x) for x in matplotlib.__version__.split('.')]
-
-        (superMajor, major, minor) = versionPieces[0:3]
-
-        minVersionSatisfied = (superMajor >= version[0] and major >= version[1]
-                               and minor >= version[2])
-        return minVersionSatisfied
-
     def plot(self):
         fig = self._doPlot()
         if not pylab.isinteractive():

Utils.py

@@ -95,11 +95,12 @@ def getCDF(values):
 
     return line
 
-def _check_min_matplotlib_version(self, version):
-    versionPieces = [int(x) for x in matplotlib.__version__.split('.')]
+def _check_min_matplotlib_version(min_super_major, min_major, min_minor):
+    version_pieces = [int(x) for x in matplotlib.__version__.split('.')]
 
-    (superMajor, major, minor) = versionPieces[0:3]
+    (super_major, major, minor) = version_pieces[0:3]
 
-    minVersionSatisfied = (superMajor >= version[0] and major >= version[1]
-                           and minor >= version[2])
-    return minVersionSatisfied
+    min_version_satisfied = (super_major >= min_super_major
+                             and major >= min_major
+                             and minor >= min_minor)
+    return min_version_satisfied

WeightedPlotLayout.py

@@ -5,7 +5,7 @@
 import os
 from boomslang import PlotLayout
 
-from Utils import getGoldenRatioDimensions
+from Utils import getGoldenRatioDimensions, _check_min_matplotlib_version
 
 class WeightedPlotLayout(PlotLayout):
     def __init__(self):
@@ -169,12 +169,9 @@ def applyParams(r, pp):
             figLegendKeywords = {}
 
             if self.figLegendCols is not None:
-                versionPieces = [int(x) for x in matplotlib.__version__.split('.')]
-
-                (superMajor, major, minor) = versionPieces[0:3]
-
-                if superMajor == 0 and major < 98:
-                    print >>sys.stderr, "Number of columns support not available in versions of matplotlib prior to 0.98"
+                if _check_min_matplotlib_version(0, 98, 0):
+                    print >>sys.stderr, "Number of columns support not " \
+                        "available in versions of matplotlib prior to 0.98"
                 else:
                     figLegendKeywords["ncol"] = self.figLegendCols