Commit 0871c87b authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

[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
parent e2e092cf

django/contrib/gis/utils/ogrinspect.py

+28 −28
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=Non 
        elif field_type is OFTDate:

            yield '    %s = models.TimeField(%s)' % (mfield, kwargs_str[2:])

        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).

    gtype = layer.geom_type

django/db/models/sql/query.py

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,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
@@ -1823,7 +1823,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.