From b7a9281679a1e2b448abd92bbbeaf7749b59cc88 Mon Sep 17 00:00:00 2001
From: Konsta Vesterinen <konsta.vesterinen@gmail.com>
Date: Thu, 28 May 2015 19:02:54 +0300
Subject: [PATCH] Fix module import order

---
 sqlalchemy_utils/types/pg_composite.py | 24 +++++++++++++-----------
 tests/types/test_composite.py          |  6 +++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/sqlalchemy_utils/types/pg_composite.py b/sqlalchemy_utils/types/pg_composite.py
index 163ed59..c838f07 100644
--- a/sqlalchemy_utils/types/pg_composite.py
+++ b/sqlalchemy_utils/types/pg_composite.py
@@ -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):
     """
diff --git a/tests/types/test_composite.py b/tests/types/test_composite.py
index 3f2ac06..885b3da 100644
--- a/tests/types/test_composite.py
+++ b/tests/types/test_composite.py
@@ -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