Merge remote-tracking branch 'origin/master' into f4-merge-branch

Change-Id: Ie6c321e67aa9338334e4649879e60847a5d1eb56

4 files changed, 6 insertions, 4 deletions

diff --git a/openstackclient/tests/unit/compute/v2/fakes.py b/openstackclient/tests/unit/compute/v2/fakes.py
index d5fc9fa9..0fae19af 100644
--- a/openstackclient/tests/unit/compute/v2/fakes.py
+++ b/openstackclient/tests/unit/compute/v2/fakes.py
@@ -14,9 +14,10 @@
 #
 
 import copy
-import mock
 import uuid
 
+import mock
+
 from openstackclient.api import compute_v2
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
diff --git a/openstackclient/tests/unit/compute/v2/test_keypair.py b/openstackclient/tests/unit/compute/v2/test_keypair.py
index d6f5ecf4..0e5fb143 100644
--- a/openstackclient/tests/unit/compute/v2/test_keypair.py
+++ b/openstackclient/tests/unit/compute/v2/test_keypair.py
@@ -13,10 +13,10 @@
 #   under the License.
 #
 
-import mock
-from mock import call
 import uuid
 
+import mock
+from mock import call
 from osc_lib import exceptions
 from osc_lib import utils
 
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 5b0d28a1..a1225c30 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -15,9 +15,9 @@
 import argparse
 import collections
 import getpass
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils as common_utils
 from oslo_utils import timeutils
diff --git a/openstackclient/tests/unit/compute/v2/test_usage.py b/openstackclient/tests/unit/compute/v2/test_usage.py
index a383e903..a7aa1374 100644
--- a/openstackclient/tests/unit/compute/v2/test_usage.py
+++ b/openstackclient/tests/unit/compute/v2/test_usage.py
@@ -12,6 +12,7 @@
 #
 
 import datetime
+
 import mock
 
 from openstackclient.compute.v2 import usage