From ed8df0a998609d2ffd71276bb3b039f1fbc2ab11 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Tue, 20 Apr 2004 10:04:09 +0000 Subject: [PATCH] Updated sorted for 2.4 compatibility. --- plugins/Topic.py | 2 +- src/utils.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/Topic.py b/plugins/Topic.py index 4cc8ddfa0..dd3dd044e 100644 --- a/plugins/Topic.py +++ b/plugins/Topic.py @@ -151,7 +151,7 @@ class Topic(callbacks.Privmsg): except ValueError: irc.error('The positions must be valid integers.') return - if utils.sorted(order) != range(num): + if sorted(order) != range(num): irc.error('Duplicate topic numbers cannot be specified.') return try: diff --git a/src/utils.py b/src/utils.py index 255ecdb62..b2ea2d77b 100755 --- a/src/utils.py +++ b/src/utils.py @@ -394,13 +394,18 @@ def sortBy(f, L, cmp=cmp): for (i, elt) in enumerate(L): L[i] = L[i][2] -def sorted(iterable, *args, **kwargs): - """Returns a sorted list made from iterable. All other args are given to - list.sort unchanged.""" +def sorted(iterable, cmp=None, key=None, reversed=False): L = list(iterable) - L.sort(*args, **kwargs) + if key is not None: + sortBy(key, L, cmp=cmp) + else: + L.sort(cmp) + if reversed: + L.reverse() return L +__builtins__['sorted'] = sorted + def mktemp(suffix=''): """Gives a decent random string, suitable for a filename.""" import sha