fix test failures

ddale · ddale · commit 05d90e2cd358 · 2011-09-19T09:27:18.000-04:00
diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -200,7 +200,7 @@ def rescale(self, units):
     @with_doc(np.ndarray.astype)
     def astype(self, dtype=None):
         '''Scalars are returned as scalar Quantity arrays.'''
-        ret = super(Quantity, self).astype(dtype)
+        ret = super(Quantity, self.view(Quantity)).astype(dtype)
         # scalar quantities get converted to plain numbers, so we fix it
         # might be related to numpy ticket # 826
         if not isinstance(ret, type(self)):
@@ -570,6 +570,10 @@ def prod(self, axis=None, dtype=None, out=None):
             copy=False
         )
 
+    @with_doc(np.ndarray.cumsum)
+    def cumsum(self, axis=None, dtype=None, out=None):
+        return super(Quantity, self).cumsum(axis, dtype, out)*self.units
+
     @with_doc(np.ndarray.cumprod)
     def cumprod(self, axis=None, dtype=None, out=None):
         if self._dimensionality:
diff --git a/quantities/tests/test_dimensionality.py b/quantities/tests/test_dimensionality.py
@@ -13,7 +13,7 @@
 joule = Dimensionality({pq.kg: 1, pq.m: 2, pq.s: -2})
 joule_str = 'kg*m**2/s**2'
 joule_uni = 'kg·m²/s²'
-joule_tex = r'$\mathrm{\left(\frac{kg{\cdot}m^{2}}{s^{2}}\right)}$'
+joule_tex = r'$\mathrm{\frac{kg{\cdot}m^{2}}{s^{2}}}$'
 Joule = Dimensionality({pq.J: 1})
 Joule_str = 'J'
 
@@ -137,7 +137,7 @@ def test_inplace_power(self):
     def test_simplification(self):
         self.assertEqual(Joule.simplified.string, 'kg*m**2/s**2')
         self.assertEqual(Joule.simplified, joule)
-        
+
 
     def test_gt(self):
         self.assertTrue(joule > meter)
