From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 2 Jun 2006 01:17:09 +0000 (+0000)
Subject: cleanup
X-Git-Tag: rel_0_2_2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d9ef43f9b6d453b30116920fbe373aff531805d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cleanup
---

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 3e9f2724ca..4e80aceeb6 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -197,7 +197,7 @@ class Mapper(object):
                     l.append(k)
                     
         if len(self.pks_by_table[self.mapped_table]) == 0:
-            raise exceptions.ArgumentError("Could not assemble any primary key columsn from given tables for table '%s'" % (self.mapped_table.name))
+            raise exceptions.ArgumentError("Could not assemble any primary key columns for mapped table '%s'" % (self.mapped_table.name))
             
         # make table columns addressable via the mapper
         self.columns = util.OrderedProperties()
diff --git a/lib/sqlalchemy/sql_util.py b/lib/sqlalchemy/sql_util.py
index 1a720d1d50..509a7fe3ed 100644
--- a/lib/sqlalchemy/sql_util.py
+++ b/lib/sqlalchemy/sql_util.py
@@ -16,7 +16,7 @@ class TableCollection(object):
             sorted = self._sorted
         except AttributeError, e:
             self._sorted = self._do_sort()
-            return self.sort(reverse=reverse)
+            sorted = self._sorted
         if reverse:
             x = sorted[:]
             x.reverse()