diff options
| -rw-r--r-- | django/contrib/gis/gdal/envelope.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/__init__.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/gis/gdal/envelope.py b/django/contrib/gis/gdal/envelope.py index f9cf1cfd1d..7921c978c8 100644 --- a/django/contrib/gis/gdal/envelope.py +++ b/django/contrib/gis/gdal/envelope.py @@ -126,7 +126,7 @@ class Envelope: raise TypeError('Incorrect type of argument: %s' % type(args[0])) elif len(args) == 2: # An x and an y parameter were passed in - return self.expand_to_include((args[0], args[1], args[0], args[1])) + return self.expand_to_include((args[0], args[1], args[0], args[1])) elif len(args) == 4: # Individual parameters passed in. return self.expand_to_include(args) diff --git a/django/db/models/sql/__init__.py b/django/db/models/sql/__init__.py index 31f45eb90d..762f8a5d62 100644 --- a/django/db/models/sql/__init__.py +++ b/django/db/models/sql/__init__.py @@ -1,5 +1,6 @@ from django.core.exceptions import EmptyResultSet from django.db.models.sql.query import * # NOQA +from django.db.models.sql.query import Query from django.db.models.sql.subqueries import * # NOQA from django.db.models.sql.where import AND, OR |