From d0cd59dc82b6ee0a1f9a018135027f757f1ac5d2 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@gmail.com>
Date: Feb 12 2026 04:10:16 +0000
Subject: Prefer standard library unittest and mock


Try to import unittest and mock from the standard library first, then
fallback to unittest2 and mock from PyPI if necessary.

---

diff --git a/setup.py b/setup.py
index 637bab6..64c091d 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,6 @@ setup(
     test_suite='nose.collector',
     tests_require=[
         'nose',
-        'mock',
         'freezegun',
     ],
 )
diff --git a/tests/test_changelog.py b/tests/test_changelog.py
index 3ee3e1c..2970e31 100644
--- a/tests/test_changelog.py
+++ b/tests/test_changelog.py
@@ -2,11 +2,16 @@
 
 import json
 import locale
-import mock
+
 try:
+    import unittest
+except ImportError:
     import unittest2 as unittest
+
+try:
+    from unittest import mock
 except ImportError:
-    import unittest
+    import mock
 
 from kobo.rpmlib import ChangelogEntry
 
diff --git a/tests/test_copy_compose.py b/tests/test_copy_compose.py
index 007b04c..028236c 100644
--- a/tests/test_copy_compose.py
+++ b/tests/test_copy_compose.py
@@ -1,10 +1,15 @@
 # -*- encoding: utf-8 -*-
 
 try:
+    import unittest
+except ImportError:
     import unittest2 as unittest
+
+try:
+    from unittest import mock
 except ImportError:
-    import unittest
-import mock
+    import mock
+
 import os
 import six
 from six import StringIO
diff --git a/tests/test_create_next_dir.py b/tests/test_create_next_dir.py
index d8514eb..cdfeed9 100644
--- a/tests/test_create_next_dir.py
+++ b/tests/test_create_next_dir.py
@@ -1,8 +1,16 @@
 # -*- encoding: utf-8 -*-
 
+try:
+    import unittest
+except ImportError:
+    import unittest2 as unittest
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import json
-import mock
-import unittest
 import shutil
 import tempfile
 import os
diff --git a/tests/test_essentials.py b/tests/test_essentials.py
index e4d0092..8c859ed 100644
--- a/tests/test_essentials.py
+++ b/tests/test_essentials.py
@@ -3,11 +3,15 @@
 from textwrap import dedent
 
 try:
+    import unittest
+except ImportError:
     import unittest2 as unittest
+
+try:
+    from unittest import mock
 except ImportError:
-    import unittest
+    import mock
 
-import mock
 from six import StringIO
 
 from .helpers import get_compose, get_compose_path
diff --git a/tests/test_find_latest.py b/tests/test_find_latest.py
index 048a966..bbcde48 100644
--- a/tests/test_find_latest.py
+++ b/tests/test_find_latest.py
@@ -1,12 +1,16 @@
 import os
 
-import mock
 import six
 
 try:
+    import unittest
+except ImportError:
     import unittest2 as unittest
+
+try:
+    from unittest import mock
 except ImportError:
-    import unittest
+    import mock
 
 from compose_utils import find_latest
 
diff --git a/tests/test_has_build.py b/tests/test_has_build.py
index 490cc7e..1c65927 100644
--- a/tests/test_has_build.py
+++ b/tests/test_has_build.py
@@ -1,11 +1,15 @@
 # -*- encoding: utf-8 -*-
 
-import mock
-
 try:
+    import unittest
+except ImportError:
     import unittest2 as unittest
+
+try:
+    from unittest import mock
 except ImportError:
-    import unittest
+    import mock
+
 from six import StringIO
 
 from .helpers import get_compose, get_compose_path
diff --git a/tests/test_list.py b/tests/test_list.py
index d40fafd..b28ef02 100644
--- a/tests/test_list.py
+++ b/tests/test_list.py
@@ -1,7 +1,15 @@
 # -*- encoding: utf-8 -*-
 
-import mock
-import unittest
+try:
+    import unittest
+except ImportError:
+    import unittest2 as unittest
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import tempfile
 import shutil
 import os
diff --git a/tests/test_repo_file.py b/tests/test_repo_file.py
index 703fe1a..1ef3487 100644
--- a/tests/test_repo_file.py
+++ b/tests/test_repo_file.py
@@ -5,11 +5,15 @@ import os
 import tempfile
 
 try:
+    import unittest
+except ImportError:
     import unittest2 as unittest
+
+try:
+    from unittest import mock
 except ImportError:
-    import unittest
+    import mock
 
-import mock
 from six import StringIO
 
 from .helpers import get_compose_path, get_fixture
diff --git a/tests/test_symlink.py b/tests/test_symlink.py
index 82c3b34..b026288 100644
--- a/tests/test_symlink.py
+++ b/tests/test_symlink.py
@@ -3,13 +3,17 @@
 import os
 import shutil
 import tempfile
-import mock
 from six import StringIO
 
 try:
+    import unittest
+except ImportError:
     import unittest2 as unittest
+
+try:
+    from unittest import mock
 except ImportError:
-    import unittest
+    import mock
 
 from compose_utils import symlink
 
diff --git a/tox.ini b/tox.ini
index febbfba..25ba2f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,6 @@ minversion=3.12.0
 deps=
   pytest
   pytest-cov
-  mock
   freezegun
   koji
   kobo>=0.10.0
@@ -25,6 +24,7 @@ commands=
 deps =
     {[testenv]deps}
     unittest2
+    mock
 
 [testenv:coverage]
 skip_install = true