# HG changeset patch # User Paul Boddie # Date 1481908078 -3600 # Node ID adff136b5f08778ac2dc1c5d4284b4094f52e856 # Parent 742eee39376684a084ba306cd6b6262cccabf89a Moved _max and _min into the span module. diff -r 742eee393766 -r adff136b5f08 lib/__builtins__/dict.py --- a/lib/__builtins__/dict.py Fri Dec 16 16:48:15 2016 +0100 +++ b/lib/__builtins__/dict.py Fri Dec 16 18:07:58 2016 +0100 @@ -20,7 +20,7 @@ """ from __builtins__.iterator import itemiterator -from __builtins__.sequence import _max +from __builtins__.span import _max from native import isinstance as _isinstance class dict: diff -r 742eee393766 -r adff136b5f08 lib/__builtins__/sequence.py --- a/lib/__builtins__/sequence.py Fri Dec 16 16:48:15 2016 +0100 +++ b/lib/__builtins__/sequence.py Fri Dec 16 18:07:58 2016 +0100 @@ -267,22 +267,4 @@ else: return index -def _max(x, y): - - "Return the maximum of 'x' and 'y'." - - if x >= y: - return x - else: - return y - -def _min(x, y): - - "Return the minimum of 'x' and 'y'." - - if x <= y: - return x - else: - return y - # vim: tabstop=4 expandtab shiftwidth=4 diff -r 742eee393766 -r adff136b5f08 lib/__builtins__/span.py --- a/lib/__builtins__/span.py Fri Dec 16 16:48:15 2016 +0100 +++ b/lib/__builtins__/span.py Fri Dec 16 18:07:58 2016 +0100 @@ -19,8 +19,6 @@ this program. If not, see . """ -from __builtins__.sequence import _max, _min - class slice: "Implementation of slice." @@ -113,4 +111,22 @@ return list(xrange(start_or_end, end, step)) +def _max(x, y): + + "Return the maximum of 'x' and 'y'." + + if x >= y: + return x + else: + return y + +def _min(x, y): + + "Return the minimum of 'x' and 'y'." + + if x <= y: + return x + else: + return y + # vim: tabstop=4 expandtab shiftwidth=4