[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py Merged r27142 from trunk

Dmitry Vasiliev dima at hlabs.spb.ru
Mon Aug 16 05:30:09 EDT 2004


Log message for revision 27143:
  Merged r27142 from trunk
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py	2004-08-16 09:07:16 UTC (rev 27142)
+++ Zope3/branches/ZopeX3-3.0/src/zope/cachedescriptors/property.py	2004-08-16 09:30:09 UTC (rev 27143)
@@ -63,21 +63,12 @@
 
         func, names, key_name, value_name = self.data
 
-        if names:
-            if len(names) == 1:
-                key = getattr(inst, names[0])
-            else:
-                key = [getattr(inst, name) for name in names]
-        else:
-            key = 0
-
         key = names and [getattr(inst, name) for name in names]
         value = getattr(inst, value_name, self)
 
         if value is not self:
             # We have a cached value
-            oldkey = getattr(inst, key_name, self)
-            if key == oldkey:
+            if key == getattr(inst, key_name, self):
                 # Cache is still good!
                 return value
             



More information about the Zope3-Checkins mailing list