[Python-checkins] r71127 - python/trunk/Lib/collections.py

[raymond.hettinger]

Author: raymond.hettinger
Date: Sat Apr  4 10:46:58 2009
New Revision: 71127

Log:
Replace the localized min/max calls with normal if/else

Modified:
   python/trunk/Lib/collections.py

Modified: python/trunk/Lib/collections.py
==============================================================================
--- python/trunk/Lib/collections.py	(original)
+++ python/trunk/Lib/collections.py	Sat Apr  4 10:46:58 2009
@@ -465,10 +465,10 @@
         '''
         if not isinstance(other, Counter):
             return NotImplemented
-        _max = max
         result = Counter()
         for elem in set(self) | set(other):
-            newcount = _max(self[elem], other[elem])
+            p, q = self[elem], other[elem]
+            newcount = q if p < q else p
             if newcount > 0:
                 result[elem] = newcount
         return result
@@ -482,12 +482,12 @@
         '''
         if not isinstance(other, Counter):
             return NotImplemented
-        _min = min
         result = Counter()
         if len(self) < len(other):
             self, other = other, self
         for elem in _ifilter(self.__contains__, other):
-            newcount = _min(self[elem], other[elem])
+            p, q = self[elem], other[elem]
+            newcount = p if p < q else q
             if newcount > 0:
                 result[elem] = newcount
         return result