don't memoize the simplified property for units or dimensionalities, or

ddale · ddale · commit b128e6a164e0 · 2010-02-02T14:14:09.000-05:00
set_default_units can suffer. Fixes #515314.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -10,6 +10,7 @@ Bugs fixed
 **********
 
 * #501563 incorrect conversion ratio for gills/pints
+* #515314 don't memoize simplified, fixes set_default_units
 
 -----
 0.7.0
diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py
@@ -30,7 +30,6 @@ def ndims(self):
         return sum(abs(i) for i in self.simplified.itervalues())
 
     @property
-    @memoize
     def simplified(self):
         if len(self):
             rq = 1*unit_registry['dimensionless']
diff --git a/quantities/tests/test_30_quantity_conversion.py b/quantities/tests/test_30_quantity_conversion.py
@@ -46,6 +46,21 @@ def test_compound_reduction():
 
     assert_equal(str(temp1), str(temp1.simplified))
 
+def test_default_units():
+    pq.set_default_units(length='mm')
+    assert_equal(pq.m.simplified.magnitude, 1000)
+    assert_equal(pq.m.simplified.units, pq.mm)
+    x = 1*pq.m
+    y = x.simplified
+    assert_equal(y.magnitude, 1000)
+    assert_equal(y.units, pq.mm)
+    pq.set_default_units(length='m')
+    assert_equal(pq.m.simplified.magnitude, 1)
+    assert_equal(pq.m.simplified.units, pq.m)
+    z = y.simplified
+    assert_equal(z.magnitude, 1)
+    assert_equal(z.units, pq.m)
+
 class TestQuantities(unittest.TestCase):
 
     def numAssertEqual(self, a1, a2):
diff --git a/quantities/unitquantity.py b/quantities/unitquantity.py
@@ -1,4 +1,4 @@
-﻿"""
+"""
 """
 from __future__ import absolute_import
 
@@ -114,7 +114,6 @@ def definition(self):
             return self._definition
 
     @property
-    @memoize
     def simplified(self):
         return self._reference.simplified
 
@@ -305,7 +304,6 @@ def __init__(
             cls._default_unit = self
 
     @property
-    @memoize
     def simplified(self):
         return self.view(Quantity).rescale(self.get_default_unit())
 
diff --git a/quantities/utilities.py b/quantities/utilities.py
@@ -7,7 +7,7 @@ def g(*args, **kwargs):
         key = (f, tuple(args), frozenset(kwargs.items()))
         if key not in cache:
             cache[key] = f(*args, **kwargs)
-        return cache[key]
+        return cache[key].copy()
     return g
 
 
diff --git a/quantities/version.py b/quantities/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.7.96'
+__version__ = '0.7.1'
diff --git a/setup.cfg b/setup.cfg
@@ -31,7 +31,7 @@ name = quantities
 platforms = Any
 requires = numpy (>=1.3.0)
 url = http://packages.python.org/quantities
-version = 0.7.96
+version = 0.7.1
 zip_safe = False
 
 [aliases]

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`
`2`		`-__version__ = '0.7.96'`
	`2`	`+__version__ = '0.7.1'`