Sort imports.

src/aspectlib/__init__.py

@@ -4,6 +4,7 @@
 import sys
 import warnings
 from collections import deque
+from functools import partial
 from inspect import isclass
 from inspect import isfunction
 from inspect import isgenerator
@@ -12,21 +13,21 @@
 from inspect import ismethoddescriptor
 from inspect import ismodule
 from inspect import isroutine
-try:
-    from types import InstanceType
-except ImportError:
-    InstanceType = None
-from functools import partial
 from logging import getLogger
 
+from .utils import PY2
+from .utils import PY3
+from .utils import Sentinel
 from .utils import basestring
 from .utils import force_bind
 from .utils import logf
 from .utils import make_method_matcher
 from .utils import mimic
-from .utils import PY2
-from .utils import PY3
-from .utils import Sentinel
+
+try:
+    from types import InstanceType
+except ImportError:
+    InstanceType = None
 
 try:
     import __builtin__

src/aspectlib/contrib.py

@@ -1,5 +1,5 @@
-from logging import getLogger
 import time
+from logging import getLogger
 
 from aspectlib import Aspect
 

src/aspectlib/py3support.py

@@ -6,10 +6,10 @@
 from logging import getLogger
 
 from aspectlib import ExpectedGenerator
-from aspectlib import mimic
 from aspectlib import Proceed
 from aspectlib import Return
 from aspectlib import UnacceptableAdvice
+from aspectlib import mimic
 from aspectlib.utils import logf
 
 logger = getLogger(__name__)

src/aspectlib/test.py

@@ -13,12 +13,12 @@
 from aspectlib import mimic
 from aspectlib import weave
 
+from .utils import Sentinel
 from .utils import camelcase_to_underscores
 from .utils import container
 from .utils import logf
 from .utils import qualname
 from .utils import repr_ex
-from .utils import Sentinel
 
 try:
     from logging import _levelNames as nameToLevel

src/aspectlib/utils.py

@@ -1,15 +1,14 @@
 from __future__ import print_function
 
-import platform
 import logging
-import re
 import os
+import platform
+import re
 import sys
 from collections import deque
 from functools import wraps
 from inspect import isclass
 
-
 RegexType = type(re.compile(""))
 
 PY3 = sys.version_info[0] == 3

tests/test_aspectlib_debug.py

@@ -4,16 +4,17 @@
 import re
 import sys
 import weakref
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
 
 import pytest
 
 import aspectlib
 import aspectlib.debug
 
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
 
 LOG_TEST_SIMPLE = r'''^some_meth\(1, 2, 3, a=4\) +<<< .*tests/test_aspectlib_debug.py:\d+:test_simple.*
 some_meth => \.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. !"#\$%&\'\(\)\*\+,-\./0123456789:;<=>\?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[\\\]\^_`abcdefghijklmnopqrstuvwxyz\{\|\}~\.+

tests/test_aspectlib_test.py

@@ -1,20 +1,20 @@
 from __future__ import print_function
 
 from pytest import raises
+from test_pkg1.test_pkg2 import test_mod
 
 from aspectlib import PY2
+from aspectlib.test import OrderedDict
+from aspectlib.test import Story
+from aspectlib.test import StoryResultWrapper
 from aspectlib.test import _Binds
 from aspectlib.test import _format_calls
 from aspectlib.test import _Raises
 from aspectlib.test import _Returns
 from aspectlib.test import mock
-from aspectlib.test import OrderedDict
 from aspectlib.test import record
-from aspectlib.test import Story
-from aspectlib.test import StoryResultWrapper
 from aspectlib.utils import PY26
 from aspectlib.utils import repr_ex
-from test_pkg1.test_pkg2 import test_mod
 
 format_calls = lambda calls: ''.join(_format_calls(calls))
 

tests/test_integrations_py2.py

@@ -3,19 +3,20 @@
 except ImportError:
     from io import StringIO
 from datetime import timedelta
+
 import pytest
-import sys
 import trollius as asyncio
 from tornado import gen
 from tornado import ioloop
+
+from aspectlib import debug
+from aspectlib.test import Story
+
 try:
     import MySQLdb
 except ImportError:
     MySQLdb = None
 
-from aspectlib import debug, weave, ALL_METHODS
-from aspectlib.test import Story
-
 
 def test_decorate_asyncio_coroutine():
     buf = StringIO()

tests/test_integrations_py3.py

@@ -2,9 +2,9 @@
     from StringIO import StringIO
 except ImportError:
     from io import StringIO
+import asyncio
 from datetime import timedelta
 
-import asyncio
 from tornado import gen
 from tornado import ioloop