Use the newer unittest.mock from standard library on Python 3

ros · Apr 4, 2024 · d513c21 · d513c21
1 parent ff31d45
commit d513c21
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/package.xml b/package.xml
@@ -40,7 +40,6 @@
   <build_export_depend condition="$ROS_PYTHON_VERSION == 3">python3-nose</build_export_depend>
 
   <test_depend condition="$ROS_PYTHON_VERSION == 2">python-mock</test_depend>
-  <test_depend condition="$ROS_PYTHON_VERSION == 3">python3-mock</test_depend>
   <test_depend condition="$ROS_PYTHON_VERSION == 2">python-nose</test_depend>
   <test_depend condition="$ROS_PYTHON_VERSION == 3">python3-nose</test_depend>
 

diff --git a/test/unit_tests/test_environment_cache.py b/test/unit_tests/test_environment_cache.py
@@ -4,7 +4,10 @@
 import tempfile
 import unittest
 
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 try:
     import catkin.environment_cache

diff --git a/test/unit_tests/test_find_in_workspace.py b/test/unit_tests/test_find_in_workspace.py
@@ -3,7 +3,10 @@
 import tempfile
 import unittest
 
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 try:
     import catkin

diff --git a/test/unit_tests/test_parse_package_xml.py b/test/unit_tests/test_parse_package_xml.py
@@ -4,7 +4,10 @@
 import tempfile
 import unittest
 
-from mock import Mock
+try:
+    from mock import Mock
+except ImportError:
+    from mock import Mock
 
 imp.load_source('parse_package_xml',
                 os.path.join(os.path.dirname(__file__),