From: Raymond Hettinger <python@rcn.com>
Date: Sat, 4 Apr 2009 08:46:58 +0000 (+0000)
Subject: Replace the localized min/max calls with normal if/else
X-Git-Tag: v2.7a1~1582
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3bc5577e86e99f07503cb05ca2822f870b2d110;p=python

Replace the localized min/max calls with normal if/else
---

diff --git a/Lib/collections.py b/Lib/collections.py
index fb53900934..1e83a908f3 100644
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -465,10 +465,10 @@ class Counter(dict):
         '''
         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 @@ class Counter(dict):
         '''
         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