Merge pull request #1476 from allmightyspiff/issues1474

Fixing 'import mock' pylint issues

Author: allmightyspiff

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5,3.6,3.7,3.8,3.9]
+        python-version: [3.6,3.7,3.8,3.9]
 
     steps:
     - uses: actions/checkout@v2

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
-import mock
 
 import SoftLayer
 from SoftLayer.CLI import core

setup.py

@@ -50,7 +50,6 @@
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',

tests/CLI/core_tests.py

@@ -8,7 +8,7 @@
 import logging
 
 import click
-import mock
+from unittest import mock as mock
 
 from requests.models import Response
 import SoftLayer

tests/CLI/environment_tests.py

@@ -6,8 +6,7 @@
 """
 
 import click
-import mock
-# from unittest.mock import MagicMock
+from unittest import mock as mock
 
 from SoftLayer.CLI import environment
 from SoftLayer import testing

tests/CLI/helper_tests.py

@@ -11,7 +11,7 @@
 import tempfile
 
 import click
-import mock
+from unittest import mock as mock
 
 from SoftLayer.CLI import core
 from SoftLayer.CLI import exceptions

tests/CLI/modules/autoscale_tests.py

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

tests/CLI/modules/block_tests.py

@@ -10,7 +10,7 @@
 
 
 import json
-import mock
+from unittest import mock as mock
 
 
 class BlockTests(testing.TestCase):

tests/CLI/modules/config_tests.py

@@ -9,7 +9,7 @@
 import sys
 import tempfile
 
-import mock
+from unittest import mock as mock
 
 import SoftLayer
 from SoftLayer import auth

tests/CLI/modules/dedicatedhost_tests.py

@@ -5,9 +5,9 @@
     :license: MIT, see LICENSE for more details.
 """
 import json
-import mock
-import SoftLayer
+from unittest import mock as mock
 
+import SoftLayer
 from SoftLayer.CLI import exceptions
 from SoftLayer.fixtures import SoftLayer_Product_Package
 from SoftLayer.fixtures import SoftLayer_Virtual_DedicatedHost