Fix error messages

.gitignore

@@ -0,0 +1,5 @@
+build/
+dist/
+genutil.egg-info/
+tests/__pycache__/
+tests/.last_failure

Lib/__init__.py

@@ -21,6 +21,7 @@
 import os  # noqa
 import sys  # noqa
 import cdat_info
+from .stats_checker import StatisticsError  # noqa
 
 # udunits bits
 from .udunits import udunits, addBaseUnit, addDimensionlessUnit, addScaledUnit  # noqa

Lib/averager.py

@@ -11,14 +11,7 @@
 
 
 class AveragerError (Exception):
-    def __init__(self, args=None):
-        """Create an exception"""
-        self.args = args
-
-    def __str__(self):
-        """Calculate the string representation"""
-        return str(self.args)
-    __repr__ = __str__
+    pass
 
 
 def _check_axisoptions(x, axisoptions):
@@ -442,7 +435,7 @@ def __check_weightoptions(x, axisoptions, weightoptions):
     if __DEBUG__:
         print('axislist = ', axislist)
     #
-    if not isinstance(weightoptions, list):
+    if not isinstance(weightoptions, (list, tuple)):
         #
         # We have either 1 axis only or multiple axes and one MV2 of weights
         #
@@ -490,6 +483,11 @@ def __check_weightoptions(x, axisoptions, weightoptions):
         #
         # We have multiple axes to deal with each with a weight....
         #
+
+        # Ensure we have a mutable list, handles tuple (https://github.com/CDAT/genutil/issues/32
+        if not isinstance(weightoptions, list):
+            weightoptions = list(weightoptions)
+
         for i in range(len(axislist)):
             weightoptions[i] = __check_each_weight_option(
                 x, axislist[i], axisindex[i], weightoptions[i])

Lib/stats_checker.py

@@ -5,15 +5,7 @@
 
 
 class StatisticsError(Exception):
-    def __init__(self, args=None):
-        """Create an exception"""
-        self.args = args
-
-    def __str__(self):
-        """Calculate the string representation"""
-        return str(self.args)
-
-    __repr__ = __str__
+    pass
 
 
 def __makeweights(x, w, axes):

tests/test_genutil_averager.py

@@ -6,6 +6,13 @@
 import unittest
 
 class GENUTIL(unittest.TestCase):
+    def testError(self):
+        error = AveragerError("Custom error message")
+
+        print(str(error))
+
+        self.assertTrue(str(error) == "Custom error message")
+
     def testAverager(self):
         f=cdms2.open(os.path.join(cdat_info.get_sampledata_path(),'tas_ukmo_con.nc'))
         x = f('tas')

tests/test_genutil_stats_missing.py

@@ -4,6 +4,11 @@
 import numpy
 
 class GENUTIL(unittest.TestCase):
+    def testError(self):
+        error = genutil.StatisticsError("Custom error message")
+
+        self.assertTrue(str(error) == "Custom error message")
+
     def testStatsMissing(self):
         a=MV2.array([1,2,3,4,5],mask=[0,0,1,0,0])
         self.assertTrue(numpy.allclose(genutil.statistics.std(a),1.58113883008))