From 89939552e87b4d019be2173aa8289ce0e450f78c Mon Sep 17 00:00:00 2001 From: Konsta Vesterinen Date: Fri, 5 Jun 2015 13:49:22 +0300 Subject: [PATCH] Fix pep8 compat --- sqlalchemy_utils/__init__.py | 2 +- sqlalchemy_utils/expressions.py | 3 +-- sqlalchemy_utils/functions/orm.py | 2 +- tests/functions/test_has_index.py | 3 --- tests/functions/test_quote.py | 1 + tests/test_expressions.py | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sqlalchemy_utils/__init__.py b/sqlalchemy_utils/__init__.py index 8b85372..0b6c0ab 100644 --- a/sqlalchemy_utils/__init__.py +++ b/sqlalchemy_utils/__init__.py @@ -8,7 +8,7 @@ from .asserts import ( # noqa ) from .exceptions import ImproperlyConfigured # noqa from .expression_parser import ExpressionParser # noqa -from .expressions import array_agg, Asterisk, row_to_json # noqa +from .expressions import array_agg, Asterisk, row_to_json # noqa from .functions import ( # noqa analyze, create_database, diff --git a/sqlalchemy_utils/expressions.py b/sqlalchemy_utils/expressions.py index 12a6bcd..d92f081 100644 --- a/sqlalchemy_utils/expressions.py +++ b/sqlalchemy_utils/expressions.py @@ -1,7 +1,6 @@ import sqlalchemy as sa from sqlalchemy.dialects.postgresql import ARRAY, JSON from sqlalchemy.ext.compiler import compiles -from sqlalchemy.sql.elements import ColumnClause from sqlalchemy.sql.expression import ( _literal_as_text, ClauseElement, @@ -123,7 +122,7 @@ class array_agg(GenericFunction): @compiles(array_agg, 'postgresql') -def compile_json_array_length(element, compiler, **kw): +def compile_array_agg(element, compiler, **kw): return "%s(%s)" % (element.name, compiler.process(element.clauses)) diff --git a/sqlalchemy_utils/functions/orm.py b/sqlalchemy_utils/functions/orm.py index 32d97f0..4b36d1c 100644 --- a/sqlalchemy_utils/functions/orm.py +++ b/sqlalchemy_utils/functions/orm.py @@ -9,11 +9,11 @@ from operator import attrgetter import six import sqlalchemy as sa +from sqlalchemy.engine.interfaces import Dialect from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.orm import mapperlib from sqlalchemy.orm.attributes import InstrumentedAttribute from sqlalchemy.orm.exc import UnmappedInstanceError -from sqlalchemy.engine.interfaces import Dialect from sqlalchemy.orm.properties import ColumnProperty from sqlalchemy.orm.query import _ColumnEntity from sqlalchemy.orm.session import object_session diff --git a/tests/functions/test_has_index.py b/tests/functions/test_has_index.py index 9c0e1c6..76906f1 100644 --- a/tests/functions/test_has_index.py +++ b/tests/functions/test_has_index.py @@ -41,12 +41,9 @@ class TestHasIndex(object): assert not has_index(self.table.c.is_archived) def test_table_without_primary_key(self): - Base = declarative_base() - article = sa.Table( 'article', sa.MetaData(), sa.Column('name', sa.String) ) - assert not has_index(article.c.name) diff --git a/tests/functions/test_quote.py b/tests/functions/test_quote.py index 36939bd..85b7a31 100644 --- a/tests/functions/test_quote.py +++ b/tests/functions/test_quote.py @@ -1,4 +1,5 @@ from sqlalchemy.dialects import postgresql + from sqlalchemy_utils.functions import quote from tests import TestCase diff --git a/tests/test_expressions.py b/tests/test_expressions.py index b6de6b6..8945820 100644 --- a/tests/test_expressions.py +++ b/tests/test_expressions.py @@ -97,7 +97,7 @@ class TestAsterisk(object): assert str(Asterisk(Article.__table__)) == 'article.*' - def test_with_table_object(self): + def test_with_quoted_identifier(self): Base = sa.ext.declarative.declarative_base() class User(Base):