fix up element sorting in declarative

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 85ccea64887b5116ff9b843931f4ab8abd588c27..ad86360808107ea901cad436775c486dcbd25445 100644 (file)
--- 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 32d6e3efade2ae8981d7add2ef4ca981818886c2..07b3ffdbbf998411981494b60b512fbbf5d52ff1 100644 (file)
--- 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: