From c47917071afebc9b715586677c87508b7472af69 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Sat, 4 Apr 2009 08:48:03 +0000 Subject: [PATCH] Replace the localized min/max calls with normal if/else --- Lib/collections.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/collections.py b/Lib/collections.py index 786a9f784a3..0d35bfd0c51 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -461,10 +461,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 @@ -478,12 +478,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 filter(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