Raise flake8-import-order version to latest

We had this library capped at a release that is a few years old. Now
that we have dropped py2 testing, we can pick up the latest version.

This uncovered a few things to clean up. Mostly the fact that mock is
now a part of the StdLib unittest since Python 3.3.

Change-Id: I27484dd4c25378413ff16e97a35a1a46062357bc
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/openstackclient/tests/unit/image/v2/fakes.py b/openstackclient/tests/unit/image/v2/fakes.py
index f69a2bc3..655ae341 100644
--- a/openstackclient/tests/unit/image/v2/fakes.py
+++ b/openstackclient/tests/unit/image/v2/fakes.py
@@ -15,10 +15,10 @@
 
 import copy
 import random
+from unittest import mock
 import uuid
 
 from glanceclient.v2 import schemas
-import mock
 from osc_lib.cli import format_columns
 import warlock
 
diff --git a/openstackclient/tests/unit/image/v2/test_image.py b/openstackclient/tests/unit/image/v2/test_image.py
index 748a61aa..78d857e2 100644
--- a/openstackclient/tests/unit/image/v2/test_image.py
+++ b/openstackclient/tests/unit/image/v2/test_image.py
@@ -14,10 +14,10 @@
 #
 
 import copy
+from unittest import mock
 
 from glanceclient.common import utils as glanceclient_utils
 from glanceclient.v2 import schemas
-import mock
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 import warlock