Mercurial > p > roundup > code
changeset 4995:0a05c4d9a221
Remove reversed/sorted from roundup.support
These shims were providing support for python v2.4, but Roundup no
longer supports v2.4 so we can safely remove them.
| author | John Kristensen <john@jerrykan.com> |
|---|---|
| date | Fri, 09 May 2014 23:50:52 +1000 |
| parents | 868db43b302a |
| children | dfd0bcc947e5 |
| files | roundup/backends/back_anydbm.py roundup/backends/rdbms_common.py roundup/hyperdb.py roundup/support.py |
| diffstat | 4 files changed, 1 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/backends/back_anydbm.py Thu May 08 18:44:29 2014 +1000 +++ b/roundup/backends/back_anydbm.py Fri May 09 23:50:52 2014 +1000 @@ -27,7 +27,6 @@ from roundup.anypy.dbm_ import anydbm, whichdb, key_in from roundup import hyperdb, date, password, roundupdb, security, support -from roundup.support import reversed from roundup.backends import locking from roundup.i18n import _
--- a/roundup/backends/rdbms_common.py Thu May 08 18:44:29 2014 +1000 +++ b/roundup/backends/rdbms_common.py Fri May 09 23:50:52 2014 +1000 @@ -59,7 +59,6 @@ from roundup.hyperdb import String, Password, Date, Interval, Link, \ Multilink, DatabaseError, Boolean, Number, Node from roundup.backends import locking -from roundup.support import reversed from roundup.i18n import _
--- a/roundup/hyperdb.py Thu May 08 18:44:29 2014 +1000 +++ b/roundup/hyperdb.py Fri May 09 23:50:52 2014 +1000 @@ -25,7 +25,7 @@ # roundup modules import date, password -from support import ensureParentsExist, PrioList, sorted, reversed +from support import ensureParentsExist, PrioList from roundup.i18n import _ #
--- a/roundup/support.py Thu May 08 18:44:29 2014 +1000 +++ b/roundup/support.py Fri May 09 23:50:52 2014 +1000 @@ -211,38 +211,4 @@ return format_columns(((width, alignment),), [text], collapse_whitespace=False) -# Python2.3 backwards-compatibility-hack. Should be removed (and clients -# fixed to use built-in reversed/sorted) when we abandon support for -# python2.3 -try: - reversed = reversed -except NameError: - def reversed(x): - x = list(x) - x.reverse() - return x - -try: - sorted = sorted -except NameError: - def sorted(iter, cmp=None, key=None, reverse=False): - if key: - l = [] - cnt = 0 # cnt preserves original sort-order - inc = [1, -1][bool(reverse)] # count down on reverse - for x in iter: - l.append ((key(x), cnt, x)) - cnt += inc - else: - l = list(iter) - if cmp: - l.sort(cmp = cmp) - else: - l.sort() - if reverse: - l.reverse() - if key: - return [x[-1] for x in l] - return l - # vim: set et sts=4 sw=4 :