Fix module import order
This commit is contained in:
@@ -95,17 +95,6 @@ http://schinckel.net/2014/09/24/using-postgres-composite-types-in-django/
|
|||||||
"""
|
"""
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
psycopg2 = None
|
|
||||||
CompositeCaster = None
|
|
||||||
adapt = None
|
|
||||||
AsIs = None
|
|
||||||
register_adapter = None
|
|
||||||
try:
|
|
||||||
import psycopg2
|
|
||||||
from psycopg2.extras import CompositeCaster
|
|
||||||
from psycopg2.extensions import adapt, AsIs, register_adapter
|
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from sqlalchemy.dialects.postgresql import ARRAY
|
from sqlalchemy.dialects.postgresql import ARRAY
|
||||||
from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2
|
from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2
|
||||||
@@ -118,8 +107,21 @@ from sqlalchemy.types import (
|
|||||||
TypeDecorator,
|
TypeDecorator,
|
||||||
UserDefinedType
|
UserDefinedType
|
||||||
)
|
)
|
||||||
|
|
||||||
from sqlalchemy_utils import ImproperlyConfigured
|
from sqlalchemy_utils import ImproperlyConfigured
|
||||||
|
|
||||||
|
psycopg2 = None
|
||||||
|
CompositeCaster = None
|
||||||
|
adapt = None
|
||||||
|
AsIs = None
|
||||||
|
register_adapter = None
|
||||||
|
try:
|
||||||
|
import psycopg2
|
||||||
|
from psycopg2.extras import CompositeCaster
|
||||||
|
from psycopg2.extensions import adapt, AsIs, register_adapter
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class CompositeElement(FunctionElement):
|
class CompositeElement(FunctionElement):
|
||||||
"""
|
"""
|
||||||
|
@@ -9,14 +9,14 @@ from sqlalchemy_utils import (
|
|||||||
CompositeType,
|
CompositeType,
|
||||||
Currency,
|
Currency,
|
||||||
CurrencyType,
|
CurrencyType,
|
||||||
NumericRangeType,
|
|
||||||
i18n,
|
i18n,
|
||||||
|
NumericRangeType,
|
||||||
register_composites,
|
register_composites,
|
||||||
remove_composite_listeners
|
remove_composite_listeners
|
||||||
)
|
)
|
||||||
from sqlalchemy_utils.types.range import intervals
|
|
||||||
from sqlalchemy_utils.types.currency import babel
|
|
||||||
from sqlalchemy_utils.types import pg_composite
|
from sqlalchemy_utils.types import pg_composite
|
||||||
|
from sqlalchemy_utils.types.currency import babel
|
||||||
|
from sqlalchemy_utils.types.range import intervals
|
||||||
from tests import TestCase
|
from tests import TestCase
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user