Fix pep8 compliancy

- Update isort requirement

setup.py

@@ -34,8 +34,7 @@ extras_require = {
         'python-dateutil>=2.2',
         'pymysql',
         'flake8>=2.4.0',
-        'isort==3.9.6',
+        'isort>=4.2.2',
-        'natsort==3.5.6',
     ],
     'anyjson': ['anyjson>=0.3.3'],
     'babel': ['Babel>=1.3'],

sqlalchemy_utils/functions/database.py

@@ -165,7 +165,8 @@ def json_sql(value, scalars_to_json=True):
     """
     scalar_convert = sa.text
     if scalars_to_json:
-        scalar_convert = lambda a: sa.func.to_json(sa.text(a))
+        def scalar_convert(a):
+            return sa.func.to_json(sa.text(a))
 
     if isinstance(value, collections.Mapping):
         return sa.func.json_build_object(
@@ -293,8 +294,7 @@ def has_index(column_or_constraint):
         columns = [column_or_constraint]
 
     return (
-        (primary_keys and starts_with(primary_keys, columns))
+        (primary_keys and starts_with(primary_keys, columns)) or
-        or
         any(
             starts_with(index.columns.values(), columns)
             for index in table.indexes
@@ -392,14 +392,12 @@ def has_unique_index(column_or_constraint):
         columns = [column_or_constraint]
 
     return (
-        (columns == primary_keys)
+        (columns == primary_keys) or
-        or
         any(
             columns == list(constraint.columns.values())
             for constraint in table.constraints
             if isinstance(constraint, sa.sql.schema.UniqueConstraint)
-        )
+        ) or
-        or
         any(
             columns == list(index.columns.values())
             for index in table.indexes
@@ -419,8 +417,7 @@ def is_auto_assigned_date_column(column):
         (
             isinstance(column.type, sa.DateTime) or
             isinstance(column.type, sa.Date)
-        )
+        ) and
-        and
         (
             column.default or
             column.server_default or

sqlalchemy_utils/functions/mock.py

@@ -47,8 +47,8 @@ def create_mock_engine(bind, stream=None):
             stream.write('\n%s;' % text)
 
     else:
-
+        def dump(*args, **kw):
-        dump = lambda *a, **kw: None
+            return None
 
     engine = sa.create_engine(bind_url, strategy='mock', executor=dump)
     return engine

sqlalchemy_utils/types/url.py

@@ -1,12 +1,13 @@
+import six
+from sqlalchemy import types
+
+from .scalar_coercible import ScalarCoercible
+
 furl = None
 try:
     from furl import furl
 except ImportError:
     pass
-import six
-from sqlalchemy import types
-
-from .scalar_coercible import ScalarCoercible
 
 
 class URLType(types.TypeDecorator, ScalarCoercible):

tests/functions/test_get_column_key.py

@@ -25,13 +25,11 @@ class TestGetColumnKey(object):
 
     def test_supports_aliases(self):
         assert (
-            get_column_key(self.Building, self.Building.__table__.c.id)
+            get_column_key(self.Building, self.Building.__table__.c.id) ==
-            ==
             'id'
         )
         assert (
-            get_column_key(self.Building, self.Building.__table__.c._name)
+            get_column_key(self.Building, self.Building.__table__.c._name) ==
-            ==
             'name'
         )
 

tests/functions/test_get_hybrid_properties.py

@@ -37,8 +37,5 @@ class TestGetHybridProperties(object):
         )
 
     def test_aliased_class(self):
-        assert (
+        props = get_hybrid_properties(sa.orm.aliased(self.Category))
-            list(get_hybrid_properties(sa.orm.aliased(self.Category)).keys())
+        assert list(props.keys()) == ['lowercase_name']
-            ==
-            ['lowercase_name']
-        )