fixing import order stuff

Author: allmightyspiff

SoftLayer/testing/__init__.py

@@ -9,9 +9,9 @@
 import logging
 import os.path
 import unittest
+from unittest import mock as mock
 
 from click import testing
-from unittest import mock as mock
 
 import SoftLayer
 from SoftLayer.CLI import core

tests/CLI/modules/autoscale_tests.py

@@ -7,8 +7,9 @@
 
     Tests for the autoscale cli command
 """
-from unittest import mock as mock
+
 import sys
+from unittest import mock as mock
 
 from SoftLayer import fixtures
 from SoftLayer import testing

tests/CLI/modules/dedicatedhost_tests.py

@@ -6,8 +6,8 @@
 """
 import json
 from unittest import mock as mock
-import SoftLayer
 
+import SoftLayer
 from SoftLayer.CLI import exceptions
 from SoftLayer.fixtures import SoftLayer_Product_Package
 from SoftLayer.fixtures import SoftLayer_Virtual_DedicatedHost

tests/CLI/modules/server_tests.py

@@ -8,16 +8,15 @@
     :license: MIT, see LICENSE for more details.
 """
 
-from unittest import mock as mock
+import json
 import sys
+import tempfile
+from unittest import mock as mock
 
 from SoftLayer.CLI import exceptions
 from SoftLayer import SoftLayerError
 from SoftLayer import testing
 
-import json
-import tempfile
-
 
 class ServerCLITests(testing.TestCase):
 

tests/CLI/modules/subnet_tests.py

@@ -4,13 +4,13 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from SoftLayer.fixtures import SoftLayer_Product_Order
-from SoftLayer.fixtures import SoftLayer_Product_Package
-from SoftLayer import testing
-
 import json
 from unittest import mock as mock
+
 import SoftLayer
+from SoftLayer.fixtures import SoftLayer_Product_Order
+from SoftLayer.fixtures import SoftLayer_Product_Package
+from SoftLayer import testing
 
 
 class SubnetTests(testing.TestCase):

tests/CLI/modules/vs/vs_create_tests.py

@@ -4,9 +4,10 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from unittest import mock as mock
+
 import sys
 import tempfile
+from unittest import mock as mock
 
 from SoftLayer.fixtures import SoftLayer_Product_Package as SoftLayer_Product_Package
 from SoftLayer import testing

tests/managers/dedicated_host_tests.py

@@ -5,8 +5,8 @@
     :license: MIT, see LICENSE for more details.
 """
 from unittest import mock as mock
-import SoftLayer
 
+import SoftLayer
 from SoftLayer import exceptions
 from SoftLayer import fixtures
 from SoftLayer import testing

tests/managers/ipsec_tests.py

@@ -4,8 +4,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-
-from mock import MagicMock
+from unittest.mock import MagicMock as MagicMock
 
 import SoftLayer
 from SoftLayer.exceptions import SoftLayerAPIError

tests/managers/network_tests.py

@@ -4,9 +4,10 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from unittest import mock as mock
+
 import sys
 import unittest
+from unittest import mock as mock
 
 import SoftLayer
 from SoftLayer import fixtures

tests/transport_tests.py

@@ -5,10 +5,10 @@
     :license: MIT, see LICENSE for more details.
 """
 import io
-import warnings
-
 import json
 from unittest import mock as mock
+import warnings
+
 import pytest
 import requests