added @skipIf to skip tests

Also, imports backport of unittest (unittest2) for @skipIf decorator.  This is needed for Python 2.4 to 2.6.

I prefer this syntax over raise SkipTest("skipped the test message").

Author: micahcochran

lib/mpl_toolkits/basemap/test.py

@@ -6,7 +6,12 @@
 # beginnings of a test suite.
 
 from numpy.testing import TestCase, assert_almost_equal
-from unittest import SkipTest
+
+try:
+	from unittest import skipIf
+except ImportError:
+	# for new features, fallback to unittest backport for Python 2.4 - 2.6
+	from unittest2 import skipIf
 
 # For Python 3.x this will be true
 PY3 = (sys.version_info[0] == 3)
@@ -154,7 +159,8 @@ def test_less_than_n_by_3_points_should_work(self):
         lonsout = bm.shiftdata(lonsin[:, :2])
         assert_almost_equal(lonsout_expected, lonsout)
 
-
+@skipIf(PY3 and pyproj.__version__ <= "1.9.4", 
+        "Test skipped in Python 3.x with pyproj version 1.9.4 and below.")
 class TestProjectCoords(TestCase):
     def get_data(self):
         lons, lats = np.arange(-180, 180, 20), np.arange(-90, 90, 10)
@@ -167,10 +173,6 @@ def test_convert(self):
         """
         Should not fail on C non-contiguous arrays
         """
-        # skip test for Python 3.x and pyproj 1.9.4 or less
-        if PY3 and pyproj.__version__ <= "1.9.4":
-            raise SkipTest("Test skipped in Python 3.x with pyproj version 1.9.4 and below.")
-            
         lons, lats, bmp = self.get_data()
         assert not lons.flags['C_CONTIGUOUS']
         assert isinstance(lons, np.ndarray)
@@ -180,10 +182,6 @@ def test_convert(self):
 
 
     def test_results_should_be_same_for_c_and_f_order_arrays(self):
-        # skip test for Python 3.x and pyproj 1.9.4 or less
-        if PY3 and pyproj.__version__ <= "1.9.4":
-            raise SkipTest("Test skipped in Python 3.x with pyproj version 1.9.4 and below.")
-            
         lons, lats, bmp = self.get_data()
 
         xx1, yy1 = bmp(lons.copy(order="C"), lats.copy(order="C"))