add truedivide and floordivide to MV2

Lib/MV2.py

@@ -289,6 +289,8 @@ def compress(a, b):
 subtract = var_binary_operation(numpy.ma.subtract)
 multiply = var_binary_operation(numpy.ma.multiply)
 divide = var_binary_operation(numpy.ma.divide)
+true_divide = var_binary_operation(numpy.ma.true_divide)
+floor_divide = var_binary_operation(numpy.ma.floor_divide)
 equal = var_binary_operation(numpy.ma.equal)
 less_equal = var_binary_operation(numpy.ma.less_equal)
 greater_equal = var_binary_operation(numpy.ma.greater_equal)
@@ -399,6 +401,7 @@ def set_print_limit(limit=numpy.inf):
 all = alltrue
 logical_not = var_unary_operation(numpy.ma.logical_not)
 divide.reduce = None
+true_divide.reduce = None
 remainder = var_binary_operation(numpy.ma.remainder)
 remainder.reduce = None
 fmod = var_binary_operation(numpy.ma.fmod)

Lib/avariable.py

@@ -1547,6 +1547,12 @@ def __mul__(self, other):
 
     __rmul__ = __mul__
 
+    def __floordiv__(self, other):
+        return MV.floor_divide(self, other)
+
+    def __truediv__(self, other):
+        return MV.true_divide(self, other)
+
     def __div__(self, other):
         return MV.divide(self, other)
 

Lib/dataset.py

@@ -2196,7 +2196,7 @@ def getBoundsAxis(self, n, boundid=None):
 
     def __repr__(self):
         filerep = repr(self._file_)
-        loc = string.find(filerep, "file")
+        loc = filerep.find("file")
         if loc == -1:
             loc = 0
         return "<CDMS " + filerep[loc:-1] + ", status: %s>" % self._status_

Lib/grid.py

@@ -5,9 +5,7 @@
 import re
 from .error import CDMSError
 import numpy  # , PropertiedClasses, internattr
-# import regrid2._regrid
 import copy
-import string
 import sys
 from .cdmsobj import CdmsObj
 from .axis import TransientAxis, createAxis, createUniformLatitudeAxis
@@ -195,7 +193,7 @@ def listall(self, all=None):
         return result
 
     def __str__(self):
-        return string.join(self.listall(), "\n") + "\n"
+        return "\n".join(self.listall())
 
     __repr__ = __str__
 

Lib/hgrid.py

@@ -662,7 +662,7 @@ def getAxisList(self):
         return (self._lataxis_.getAxis(0), self._lataxis_.getAxis(1))
 
     def isClose(self, g):
-        """Return 1 iff g is a grid of the same type and shape. A real element-by-element
+        """Return 1 if g is a grid of the same type and shape. A real element-by-element
         comparison would be too expensive here."""
         if g is None:
             return 0

Lib/tvariable.py

@@ -137,6 +137,8 @@ def __copy__(self):
     __rsub__ = AbstractVariable.__rsub__
     __isub__ = AbstractVariable.__isub__
     __div__ = AbstractVariable.__div__
+    __truediv__ = AbstractVariable.__truediv__
+    __floordiv__ = AbstractVariable.__floordiv__
     __rdiv__ = AbstractVariable.__rdiv__
     __idiv__ = AbstractVariable.__idiv__
     __pow__ = AbstractVariable.__pow__