Changeset 308

Timestamp:

02/25/08 14:05:22 (5 years ago)

Author:

ged

Message:

Nth take at making Elixir python2.3 compatible

Location:

elixir/trunk/elixir

Files:

• entity.py (modified) (1 diff)
• py23compat.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -4 +4 @@
 '''
 
-from py23compat import set, rsplit
+from py23compat import set, rsplit, sorted
 
 import sys

elixir/trunk/elixir/py23compat.py

@@ -13 +13 @@
     # global name 'sorted' doesn't exist in Python2.3
     # this provides a poor-man's emulation of the sorted built-in method
-    def sorted(l, kwargs):
-        if 'key' not in kwargs:
-            raise Exception('Our python 2.3 version of sorted needs a key kwarg argument')
-        key_func = kwargs['key']
+    def sorted(l, **kwargs):
         sorted_list = list(l)
-        sorted_list.sort(lambda self, other: cmp(key_func(self),
-                                                 key_func(other)))
+        if 'key' in kwargs:
+            key_func = kwargs['key']
+            sorted_list.sort(lambda self, other: cmp(key_func(self),
+                                                     key_func(other)))
+        else:
+            sorted_list.sort()
         return sorted_list