← Back to branch summary

~ubuntu-branches/debian/sid/python-django/sid

« back to all changes in this revision

Viewing changes to django/contrib/gis/db/models/sql/compiler.py

  • Committer: Package Import Robot
  • Author(s): Luke Faraone
  • Date: 2014-04-21 16:47:14 UTC
  • mfrom: (1.3.14)
  • Revision ID: package-import@ubuntu.com-20140421164714-3mlvyr7y1ssdo9e6
Tags: 1.6.3-1
* New upstream security release.
  - Unexpected code execution using ``reverse()``
  - CVE-2014-0472
  - Caching of anonymous pages could reveal CSRF token
  - CVE-2014-0473
  - MySQL typecasting could result in unexpected matches
  - CVE-2014-0474
* Drop patches 07_translation_encoding_fix and ticket21869.diff; merged
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/gis/db/models/sql/compiler.py
123
123
        seen = self.query.included_inherited_models.copy()
124
124
        if start_alias:
125
125
            seen[None] = start_alias
126
 
        for field, model in opts.get_fields_with_model():
 
126
        for field, model in opts.get_concrete_fields_with_model():
127
127
            if from_parent and model is not None and issubclass(from_parent, model):
128
128
                # Avoid loading data for already loaded parents.
129
129
                continue
132
132
            if table in only_load and field.column not in only_load[table]:
133
133
                continue
134
134
            if as_pairs:
135
 
                result.append((alias, field.column))
 
135
                result.append((alias, field))
136
136
                aliases.add(alias)
137
137
                continue
138
138
            # This part of the function is customized for GeoQuery. We