Skip to content

Commit b6ebad8

Browse files
committed
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.
1 parent 75b6127 commit b6ebad8

File tree

4 files changed

+1
-37
lines changed

4 files changed

+1
-37
lines changed

roundup/backends/back_anydbm.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from roundup.anypy.dbm_ import anydbm, whichdb, key_in
2828

2929
from roundup import hyperdb, date, password, roundupdb, security, support
30-
from roundup.support import reversed
3130
from roundup.backends import locking
3231
from roundup.i18n import _
3332

roundup/backends/rdbms_common.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
from roundup.hyperdb import String, Password, Date, Interval, Link, \
6060
Multilink, DatabaseError, Boolean, Number, Node
6161
from roundup.backends import locking
62-
from roundup.support import reversed
6362
from roundup.i18n import _
6463

6564

roundup/hyperdb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
# roundup modules
2727
import date, password
28-
from support import ensureParentsExist, PrioList, sorted, reversed
28+
from support import ensureParentsExist, PrioList
2929
from roundup.i18n import _
3030

3131
#

roundup/support.py

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -211,38 +211,4 @@ def wrap(text, width=75, alignment=LEFTN):
211211
return format_columns(((width, alignment),), [text],
212212
collapse_whitespace=False)
213213

214-
# Python2.3 backwards-compatibility-hack. Should be removed (and clients
215-
# fixed to use built-in reversed/sorted) when we abandon support for
216-
# python2.3
217-
try:
218-
reversed = reversed
219-
except NameError:
220-
def reversed(x):
221-
x = list(x)
222-
x.reverse()
223-
return x
224-
225-
try:
226-
sorted = sorted
227-
except NameError:
228-
def sorted(iter, cmp=None, key=None, reverse=False):
229-
if key:
230-
l = []
231-
cnt = 0 # cnt preserves original sort-order
232-
inc = [1, -1][bool(reverse)] # count down on reverse
233-
for x in iter:
234-
l.append ((key(x), cnt, x))
235-
cnt += inc
236-
else:
237-
l = list(iter)
238-
if cmp:
239-
l.sort(cmp = cmp)
240-
else:
241-
l.sort()
242-
if reverse:
243-
l.reverse()
244-
if key:
245-
return [x[-1] for x in l]
246-
return l
247-
248214
# vim: set et sts=4 sw=4 :

0 commit comments

Comments
 (0)