[Checkins] SVN: zope.cachedescriptors/trunk/src/zope/cachedescriptors/ Porting to Python 3.

Albertas Agejevas cvs-admin at zope.org
Wed Feb 13 20:52:19 UTC 2013


Log message for revision 129354:
  Porting to Python 3.

Changed:
  U   zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.py
  U   zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.txt
  U   zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.py
  U   zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.txt

-=-
Modified: zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.py
===================================================================
--- zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.py	2013-02-13 17:27:14 UTC (rev 129353)
+++ zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.py	2013-02-13 20:52:18 UTC (rev 129354)
@@ -52,6 +52,5 @@
     @staticmethod
     def _get_cache_key(*args, **kwargs):
         kw = kwargs.items()
-        kw.sort()
-        key = (args, tuple(kw))
+        key = (args, tuple(sorted(kw)))
         return key

Modified: zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.txt
===================================================================
--- zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.txt	2013-02-13 17:27:14 UTC (rev 129353)
+++ zope.cachedescriptors/trunk/src/zope/cachedescriptors/method.txt	2013-02-13 20:52:18 UTC (rev 129354)
@@ -17,7 +17,7 @@
     ...
     ...     @method.cachedIn('_cache')
     ...     def distance(self, x, y):
-    ...         print 'computing distance'
+    ...         print('computing distance')
     ...         return math.hypot(self.x - x, self.y - y)
     ...
     >>> point = Point(1.0, 2.0)   
@@ -74,7 +74,7 @@
     ...
     ...     @method.cachedIn('_cache', MyDict)
     ...     def distance(self, x, y):
-    ...         print 'computing distance'
+    ...         print('computing distance')
     ...         return math.sqrt((self.x - x)**2 + (self.y - y)**2)
     ...
     >>> point = Point(1.0, 2.0)   

Modified: zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.py
===================================================================
--- zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.py	2013-02-13 17:27:14 UTC (rev 129353)
+++ zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.py	2013-02-13 20:52:18 UTC (rev 129354)
@@ -14,7 +14,7 @@
 See the CachedProperty class.
 """
 
-ncaches = 0l
+ncaches = 0
 
 
 class CachedProperty(object):

Modified: zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.txt
===================================================================
--- zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.txt	2013-02-13 17:27:14 UTC (rev 129353)
+++ zope.cachedescriptors/trunk/src/zope/cachedescriptors/property.txt	2013-02-13 20:52:18 UTC (rev 129354)
@@ -22,7 +22,7 @@
     ...         self.x, self.y = x, y
     ...
     ...     def radius(self):
-    ...         print 'computing radius'
+    ...         print('computing radius')
     ...         return math.sqrt(self.x**2 + self.y**2)
     ...     radius = property.CachedProperty(radius, 'x', 'y')
 
@@ -81,7 +81,7 @@
     ...
     ...     @property.Lazy
     ...     def radius(self):
-    ...         print 'computing radius'
+    ...         print('computing radius')
     ...         return math.sqrt(self.x**2 + self.y**2)
 
     >>> point = Point(1.0, 2.0)   
@@ -123,7 +123,7 @@
 want to use a different name, we need to pass it:
 
     >>> def d(point):
-    ...     print 'computing diameter'
+    ...     print('computing diameter')
     ...     return 2*point.radius
 
     >>> Point.diameter = property.Lazy(d, 'diameter')
@@ -146,7 +146,7 @@
     ...
     ...     @property.readproperty
     ...     def radius(self):
-    ...         print 'computing radius'
+    ...         print('computing radius')
     ...         return math.sqrt(self.x**2 + self.y**2)
 
     >>> point = Point(1.0, 2.0)   
@@ -180,7 +180,7 @@
     ...
     ...     @property.cachedIn('_radius_attribute')
     ...     def radius(self):
-    ...         print 'computing radius'
+    ...         print('computing radius')
     ...         return math.sqrt(self.x**2 + self.y**2)
     
     >>> point = Point(1.0, 2.0)   



More information about the checkins mailing list