Move six to the right location

Third party imports are supposed to be after standard library imports
so make six be after. Some newlines are also added to separate
standard library imports from all the others.

Co-authored-by: Ivan A. Melnikov <imelnikov@griddynamics.com>
Change-Id: Ied067e9367612758666da726df195ed390215e1b

taskflow/engines/action_engine/executor.py

@@ -18,9 +18,9 @@
 
 import abc
 import contextlib
-import six
 
 from concurrent import futures
+import six
 
 from taskflow.utils import async_utils
 from taskflow.utils import misc

taskflow/flow.py

@@ -17,6 +17,7 @@
 #    under the License.
 
 import abc
+
 import six
 
 from taskflow.utils import reflection

taskflow/persistence/backends/__init__.py

@@ -17,6 +17,7 @@
 #    under the License.
 
 import logging
+
 from stevedore import driver
 
 from taskflow import exceptions as exc

taskflow/persistence/backends/impl_dir.py

@@ -21,10 +21,11 @@ import errno
 import logging
 import os
 import shutil
-import six
 import threading
 import weakref
 
+import six
+
 from taskflow import exceptions as exc
 from taskflow.openstack.common import jsonutils
 from taskflow.openstack.common import timeutils

taskflow/persistence/logbook.py

@@ -18,6 +18,7 @@
 #    under the License.
 
 import logging
+
 import six
 
 from taskflow.openstack.common import uuidutils

taskflow/storage.py

@@ -18,6 +18,7 @@
 
 import contextlib
 import logging
+
 import six
 
 from taskflow import exceptions

taskflow/tests/test_examples.py

@@ -34,6 +34,7 @@ import os
 import re
 import subprocess
 import sys
+
 import taskflow.test
 
 ROOT_DIR = os.path.abspath(

taskflow/tests/unit/test_green_executor.py

@@ -18,6 +18,7 @@
 
 import collections
 import functools
+
 import testtools
 
 from taskflow import test

taskflow/tests/unit/test_storage.py

@@ -17,6 +17,7 @@
 #    under the License.
 
 import contextlib
+
 import mock
 
 from taskflow import exceptions

taskflow/tests/unit/test_suspend_flow.py

@@ -16,19 +16,18 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
 import time
 
-from taskflow.patterns import linear_flow as lf
+import testtools
-from taskflow.utils import eventlet_utils as eu
 
 import taskflow.engines
-
 from taskflow import exceptions as exc
+from taskflow.patterns import linear_flow as lf
 from taskflow import states
 from taskflow import task
 from taskflow import test
 from taskflow.tests import utils
+from taskflow.utils import eventlet_utils as eu
 
 
 class TestTask(task.Task):

taskflow/tests/utils.py

@@ -17,9 +17,10 @@
 #    under the License.
 
 import contextlib
-import six
 import time
 
+import six
+
 from taskflow.persistence.backends import impl_memory
 from taskflow import task
 

taskflow/utils/graph_utils.py

@@ -16,10 +16,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 import networkx as nx
-from networkx import algorithms
+import six
 
 
 def get_edge_attrs(graph, u, v):
@@ -47,7 +45,7 @@ def merge_graphs(graphs, allow_overlaps=False):
                                                              len(overlaps)))
         # Keep the target graphs name.
         name = graph.name
-        graph = algorithms.compose(graph, g)
+        graph = nx.algorithms.compose(graph, g)
         graph.name = name
     return graph
 

taskflow/utils/misc.py

@@ -24,12 +24,13 @@ import functools
 import keyword
 import logging
 import os
-import six
 import string
 import sys
 import time
 import traceback
 
+import six
+
 from taskflow import exceptions
 from taskflow.utils import reflection
 

taskflow/utils/reflection.py

@@ -17,9 +17,10 @@
 #    under the License.
 
 import inspect
-import six
 import types
 
+import six
+
 
 def get_member_names(obj, exclude_hidden=True):
     """Get all the member names for a object."""

taskflow/utils/threading_utils.py

@@ -18,10 +18,11 @@
 
 import logging
 import multiprocessing
-import six
 import threading
 import types
 
+import six
+
 from taskflow.utils import lock_utils
 
 LOG = logging.getLogger(__name__)