[2.2.x] Fixed E117 and F405 flake8 warnings.

Backport of 5a5c77d55d from master

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)

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