1
0
mirror of https://github.com/django/django.git synced 2025-07-18 16:49:13 +00:00

[1.0.X] Fixed #11216 and #11218 -- Corrected a few typos, thanks buriy.

Backport of [10861] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Gary Wilson Jr 2009-05-29 04:39:59 +00:00
parent e2e092cff9
commit 0871c87b77
2 changed files with 30 additions and 30 deletions

View File

@ -192,7 +192,7 @@ def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=Non
elif field_type is OFTDate: elif field_type is OFTDate:
yield ' %s = models.TimeField(%s)' % (mfield, kwargs_str[2:]) yield ' %s = models.TimeField(%s)' % (mfield, kwargs_str[2:])
else: else:
raise TypeError('Unknown field type %s in %s' % (fld_type, mfield)) raise TypeError('Unknown field type %s in %s' % (field_type, mfield))
# TODO: Autodetection of multigeometry types (see #7218). # TODO: Autodetection of multigeometry types (see #7218).
gtype = layer.geom_type gtype = layer.geom_type

View File

@ -425,7 +425,7 @@ class BaseQuery(object):
If 'with_aliases' is true, any column names that are duplicated If 'with_aliases' is true, any column names that are duplicated
(without the table names) are given unique aliases. This is needed in (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 qn = self.quote_name_unless_alias
qn2 = self.connection.ops.quote_name qn2 = self.connection.ops.quote_name
@ -1823,7 +1823,7 @@ class BaseQuery(object):
return cursor return cursor
if result_type == SINGLE: if result_type == SINGLE:
if self.ordering_aliases: if self.ordering_aliases:
return cursor.fetchone()[:-len(results.ordering_aliases)] return cursor.fetchone()[:-len(self.ordering_aliases)]
return cursor.fetchone() return cursor.fetchone()
# The MULTI case. # The MULTI case.