fixed mock import and removed obsolete sys.version check

arista-eosplus · Jun 12, 2023 · ffec330 · ffec330
1 parent 8906eb7
commit ffec330
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/test/lib/testlib.py b/test/lib/testlib.py
@@ -34,7 +34,7 @@
 import string
 import unittest
 
-from mock import MagicMock as Mock
+from unittest.mock import MagicMock as Mock
 
 from pyeapi.client import Node
 

diff --git a/test/system/test_client.py b/test/system/test_client.py
@@ -37,7 +37,7 @@
 sys.path.append(os.path.join(os.path.dirname(__file__), '../lib'))
 
 from testlib import random_int, random_string, get_fixture
-from mock import patch
+from unittest.mock import patch
 
 import pyeapi.client
 import pyeapi.eapilib

diff --git a/test/unit/test_client.py b/test/unit/test_client.py
@@ -36,7 +36,7 @@
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '../lib'))
 
-from mock import Mock, patch, call
+from unittest.mock import Mock, patch, call
 
 from testlib import get_fixture, random_string, random_int
 

diff --git a/test/unit/test_eapilib.py b/test/unit/test_eapilib.py
@@ -1,7 +1,7 @@
 import unittest
 import json
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 import pyeapi.eapilib
 

diff --git a/test/unit/test_utils.py b/test/unit/test_utils.py
@@ -1,13 +1,9 @@
-import sys
 import unittest
 
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 import pyeapi.utils
 
-if sys.version_info < (3, 3):
-    from collections import Iterable
-else:
-    from collections.abc import Iterable
+from collections.abc import Iterable
 
 class TestUtils(unittest.TestCase):