From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 19 Sep 2008 13:58:12 +0000 (+0000)
Subject: fix up element sorting in declarative
X-Git-Tag: rel_0_5rc2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6f6afe1f42366af7761bf7c4ec6519632106d5c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix up element sorting in declarative
---

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 85ccea6488..ad86360808 100644
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -239,8 +239,7 @@ def _as_declarative(cls, classname, dict_):
         our_stuff[k] = prop
 
     # set up attributes in the order they were created
-    our_stuff.sort(lambda x, y: cmp(our_stuff[x]._creation_order,
-                                    our_stuff[y]._creation_order))
+    our_stuff.sort(key=lambda key: our_stuff[key]._creation_order)
 
     table = None
     if '__table__' not in cls.__dict__:
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 32d6e3efad..07b3ffdbbf 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -646,8 +646,8 @@ class OrderedDict(dict):
         self._list = []
         dict.clear(self)
 
-    def sort(self, fn=None):
-        self._list.sort(fn)
+    def sort(self, *arg, **kw):
+        self._list.sort(*arg, **kw)
 
     def update(self, ____sequence=None, **kwargs):
         if ____sequence is not None: