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:13:49 +0100 |
| commit | 95184509733a2994cc2738c2788ed3e2539f5a42 (patch) | |
| tree | fd9d90c8aa228def7b2798f6928d69364e49eb57 | |
| parent | 01b7a140e895625dcc9306cd70f121e8c45cc863 (diff) | |
| download | django-95184509733a2994cc2738c2788ed3e2539f5a42.tar.gz | |
[2.0.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 bbcc5d068f..082bb420cd 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 |