Author: phd
Date: 2005-11-30 18:02:37 +0000 (Wed, 30 Nov 2005)
New Revision: 1328
Modified:
SQLObject/trunk/sqlobject/events.py
SQLObject/trunk/sqlobject/tests/test_events.py
Log:
Moved sorted() from tests/test_events.py to events.py.
Modified: SQLObject/trunk/sqlobject/events.py
===================================================================
--- SQLObject/trunk/sqlobject/events.py 2005-11-29 23:04:57 UTC (rev 1327)
+++ SQLObject/trunk/sqlobject/events.py 2005-11-30 18:02:37 UTC (rev 1328)
@@ -269,6 +269,24 @@
else:
return repr(v)
+try:
+ sorted
+except NameError:
+ # For Python 2.2 and 2.3:
+ def sorted(lst, cmp=None, key=None, reverse=False):
+ if key:
+ lst = [(key(i), i) for i in lst]
+ lst = lst[:]
+ if cmp:
+ lst.sort(cmp)
+ else:
+ lst.sort()
+ if key:
+ lst = [i for k, i in lst]
+ if reverse:
+ lst.reverse()
+ return lst
+
__all__ = ['listen', 'send']
for name, value in globals().items():
if isinstance(value, type) and issubclass(value, Signal):
Modified: SQLObject/trunk/sqlobject/tests/test_events.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_events.py 2005-11-29 23:04:57 UTC (rev 1327)
+++ SQLObject/trunk/sqlobject/tests/test_events.py 2005-11-30 18:02:37 UTC (rev 1328)
@@ -3,24 +3,6 @@
from sqlobject import events
import sys
-try:
- sorted
-except NameError:
- # For Python 2.3 and under:
- def sorted(lst, cmp=None, key=None, reverse=False):
- if key:
- lst = [(key(i), i) for i in lst]
- lst = lst[:]
- if cmp:
- lst.sort(cmp)
- else:
- lst.sort()
- if key:
- lst = [i for k, i in lst]
- if reverse:
- lst.reverse()
- return lst
-
class EventTester(SQLObject):
name = StringCol()
|
