summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-06-02 01:17:09 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-06-02 01:17:09 +0000
commit9d9ef43f9b6d453b30116920fbe373aff531805d (patch)
treed69435197ae29961edb397075ebb0f03bd24d167 /lib
parent297d35ba498c2f656df41737490977f88ca70682 (diff)
downloadsqlalchemy-9d9ef43f9b6d453b30116920fbe373aff531805d.tar.gz
cleanup
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
-rw-r--r--lib/sqlalchemy/sql_util.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 3e9f2724c..4e80aceeb 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 1a720d1d5..509a7fe3e 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()