diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-01-30 13:06:09 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-01-30 13:15:13 +0100 |
| commit | cea425e6eb7db9ae56e835577415267e95a56e26 (patch) | |
| tree | 40ca27b863acf1aa03aa95bd292ab5d4bc8de677 | |
| parent | 71e8cdb3a4bfd9edd6b2e098591e042ecd875a9a (diff) | |
| download | django-cea425e6eb7db9ae56e835577415267e95a56e26.tar.gz | |
[1.11.x] Fixed E117 and F405 flake8 warnings.
Backport of 5a5c77d55dc85c7e6cf910243257e408887f412a from master
| -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 64cac5baa0..0de78d8c58 100644 --- a/django/contrib/gis/gdal/envelope.py +++ b/django/contrib/gis/gdal/envelope.py @@ -126,7 +126,7 @@ class Envelope(object): raise TypeError('Incorrect type of argument: %s' % str(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 |