Fix module import order

This commit is contained in:
Konsta Vesterinen
2015-05-28 19:02:54 +03:00
parent cb43bc1d64
commit b7a9281679
2 changed files with 16 additions and 14 deletions

View File

@@ -95,17 +95,6 @@ http://schinckel.net/2014/09/24/using-postgres-composite-types-in-django/
"""
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
from sqlalchemy.dialects.postgresql import ARRAY
from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2
@@ -118,8 +107,21 @@ from sqlalchemy.types import (
TypeDecorator,
UserDefinedType
)
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):
"""

View File

@@ -9,14 +9,14 @@ from sqlalchemy_utils import (
CompositeType,
Currency,
CurrencyType,
NumericRangeType,
i18n,
NumericRangeType,
register_composites,
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.currency import babel
from sqlalchemy_utils.types.range import intervals
from tests import TestCase