Changeset 313

Timestamp:

03/27/08 18:33:22 (5 years ago)

Author:

ged

Message:

Apply one more patch from Jason R. Coombs for python2.3 compatibility
(including in our tests). Thanks!

Location:

elixir/trunk

Files:

• elixir/ext/list.py (modified) (3 diffs)
• elixir/py23compat.py (modified) (2 diffs)
• tests/test_autoload.py (modified) (1 diff)
• tests/test_events.py (modified) (1 diff)
• tests/test_inherit.py (modified) (2 diffs)
• tests/test_o2m.py (modified) (1 diff)
• tests/test_properties.py (modified) (1 diff)

elixir/trunk/elixir/ext/list.py

@@ -115 +115 @@
             qualifier_method = lambda self: None
         
-        @before_insert
         def _init_position(self):
             s = select(
@@ -125 +124 @@
             a = s.alias()
             setattr(self, position_column_name, select([func.max(a.c.value)]))
-        
-        @before_delete
+        _init_position = before_insert(_init_position)
+        
         def _shift_items(self):
             self.table.update(
@@ -137 +136 @@
                 }
             ).execute()
+        _shift_items = before_delete(_shift_items)
         
         def move_to_bottom(self):        

elixir/trunk/elixir/py23compat.py

@@ -7 +7 @@
     from sets import Set as set
 
+orig_cmp = cmp
+# [].sort
+def sort_list(l, cmp=None, key=None, reverse=False):
+    try:
+        l.sort(cmp, key, reverse)
+    except TypeError, e:
+        if not str(e).startswith('sort expected at most 1 arguments'):
+            raise
+        if cmp is None:
+            cmp = orig_cmp
+        if key is not None:
+            # the cmp=cmp parameter is required to get the original comparator
+            # into the lambda namespace
+            cmp = lambda self, other, cmp=cmp: cmp(key(self), key(other))
+        if reverse:
+            cmp = lambda self, other, cmp=cmp: -cmp(self,other)
+        l.sort(cmp) 
+
 # sorted
 try:
@@ -13 +31 @@
     # 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):
+    def sorted(l, cmp=None, key=None, reverse=False):
         sorted_list = list(l)
-        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()
+        sort_list(sorted_list, cmp, key, reverse)
         return sorted_list
 

elixir/trunk/tests/test_autoload.py

@@ -140 +140 @@
         print "Persons in the '%s' category: %s." % (
                 c.name, 
-                ", ".join(p.name for p in c.persons))
+                ", ".join([p.name for p in c.persons]))
         
         assert len(c.persons) == 4

elixir/trunk/tests/test_events.py

@@ -19 +19 @@
         name = Field(String(50))
         
-        @before_insert
         def pre_insert(self):
             global before_insert_called
             before_insert_called += 1
+        pre_insert = before_insert(pre_insert)
         
-        @after_insert
         def post_insert(self):
             global after_insert_called
             after_insert_called += 1
+        post_insert = after_insert(post_insert)
 
-        @before_update
         def pre_update(self):
             global before_update_called
             before_update_called += 1
+        pre_update = before_update(pre_update)
         
-        @after_update
         def post_update(self):
             global after_update_called
             after_update_called += 1
+        post_update = after_update(post_update)
 
-        @before_delete
         def pre_delete(self):
             global before_delete_called
             before_delete_called += 1
+        pre_delete = before_delete(pre_delete)
         
-        @after_delete
         def post_delete(self):
             global after_delete_called
             after_delete_called += 1
+        post_delete = after_delete(post_delete)
     
-        @before_insert
-        @before_update
-        @before_delete
         def pre_any(self):
             global before_any_called
             before_any_called += 1
+        pre_any = before_insert(before_update(before_delete(pre_any)))
     metadata.bind = 'sqlite:///'
 

elixir/trunk/tests/test_inherit.py

@@ -5 +5 @@
 from elixir import *
 import elixir
+from elixir.py23compat import sort_list
 
 def setup():
@@ -53 +54 @@
     for class_ in (A, B, C, D, E):
         res[class_.__name__] = class_.query.all()
-        res[class_.__name__].sort(key=lambda o: o.__class__.__name__) 
+        sort_list(res[class_.__name__], key=lambda o: o.__class__.__name__) 
 
     for query_class in ('A', 'B', 'C', 'D', 'E'):

elixir/trunk/tests/test_o2m.py

@@ -62 +62 @@
         print "%s is %s's child." % (p.name, p.father.name)        
         print "His children are: %s." % (
-                " and ".join(c.name for c in p.children))
+                " and ".join([c.name for c in p.children]))
         
         assert p in p.father.children

elixir/trunk/tests/test_properties.py

@@ -94 +94 @@
 #        assert category.score == 85 # doesn't work for now
         for user in category.users:
-            assert user.score == sum(tag.score for tag in user.tags)
+            assert user.score == sum([tag.score for tag in user.tags])
             for tag in user.tags:
                 assert tag.score == tag.score1 * tag.score2