[soc2009/model-valition] Merged to trunk at r10914

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@10916 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 4 deletions

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 394e30ba97..d290d60e63 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -689,7 +689,7 @@ class BaseQuery(object):
 
         If 'with_aliases' is true, any column names that are duplicated
         (without the table names) are given unique aliases. This is needed in
-        some cases to avoid ambiguitity with nested queries.
+        some cases to avoid ambiguity with nested queries.
         """
         qn = self.quote_name_unless_alias
         qn2 = self.connection.ops.quote_name
@@ -1303,7 +1303,7 @@ class BaseQuery(object):
         opts = self.model._meta
         root_alias = self.tables[0]
         seen = {None: root_alias}
-        
+
         # Skip all proxy to the root proxied model
         proxied_model = get_proxied_model(opts)
 
@@ -1732,7 +1732,7 @@ class BaseQuery(object):
                 raise MultiJoin(pos + 1)
             if model:
                 # The field lives on a base class of the current model.
-                # Skip the chain of proxy to the concrete proxied model                
+                # Skip the chain of proxy to the concrete proxied model
                 proxied_model = get_proxied_model(opts)
 
                 for int_model in opts.get_base_chain(model):
@@ -2362,7 +2362,7 @@ class BaseQuery(object):
             return cursor
         if result_type == SINGLE:
             if self.ordering_aliases:
-                return cursor.fetchone()[:-len(results.ordering_aliases)]
+                return cursor.fetchone()[:-len(self.ordering_aliases)]
             return cursor.fetchone()
 
         # The MULTI case.