| 1 | Patch-Source: https://github.com/getting-things-gnome/gtg/commit/2ecc997d3fb3f6d102615dafa83bda765cebd420
|
| 2 | From 2ecc997d3fb3f6d102615dafa83bda765cebd420 Mon Sep 17 00:00:00 2001
|
| 3 | From: Eli Schwartz <[email protected]>
|
| 4 | Date: Sun, 3 Dec 2023 17:41:54 -0500
|
| 5 | Subject: [PATCH] migrate from external mock package to stdlib unittest.mock
|
| 6 |
|
| 7 | It was moved to the stdlib in python 3.3, and the PyPI version is a
|
| 8 | backport for python versions less than 3.3.
|
| 9 | ---
|
| 10 | .github/workflows/unit_tests.yml | 4 ++--
|
| 11 | README.md | 4 ++--
|
| 12 | flatpak/python3-requirements-dev.yaml | 9 ---------
|
| 13 | flatpak/requirements-dev.txt | 1 -
|
| 14 | tests/backend/backend_caldav_test.py | 2 +-
|
| 15 | tests/core/test_config.py | 2 +-
|
| 16 | tests/core/test_timer.py | 2 +-
|
| 17 | tests/test_utils.py | 2 +-
|
| 18 | 8 files changed, 8 insertions(+), 18 deletions(-)
|
| 19 |
|
| 20 | diff --git a/tests/backend/backend_caldav_test.py b/tests/backend/backend_caldav_test.py
|
| 21 | index 521d7ae9c1..51d594a5d0 100644
|
| 22 | |
| 23 | |
| 24 | @@ -11,7 +11,7 @@
|
| 25 | from GTG.core.datastore import DataStore
|
| 26 | from GTG.core.dates import LOCAL_TIMEZONE, Date
|
| 27 | from GTG.core.task import Task
|
| 28 | -from mock import Mock, patch
|
| 29 | +from unittest.mock import Mock, patch
|
| 30 | from tests.test_utils import MockTimer
|
| 31 |
|
| 32 | NAMESPACE = 'unittest'
|
| 33 | diff --git a/tests/core/test_config.py b/tests/core/test_config.py
|
| 34 | index 6eee15e9b7..2607a9134d 100644
|
| 35 | |
| 36 | |
| 37 | @@ -19,7 +19,7 @@
|
| 38 | from unittest import TestCase
|
| 39 | import configparser
|
| 40 |
|
| 41 | -from mock import patch, mock_open, Mock
|
| 42 | +from unittest.mock import patch, mock_open, Mock
|
| 43 |
|
| 44 | from GTG.core.config import open_config_file, SectionConfig
|
| 45 |
|
| 46 | diff --git a/tests/core/test_timer.py b/tests/core/test_timer.py
|
| 47 | index ada5074451..fb7d5841bd 100644
|
| 48 | |
| 49 | |
| 50 | @@ -18,7 +18,7 @@
|
| 51 |
|
| 52 | import datetime
|
| 53 |
|
| 54 | -from mock import patch
|
| 55 | +from unittest.mock import patch
|
| 56 | from unittest import TestCase
|
| 57 |
|
| 58 | from GTG.core.timer import Timer
|
| 59 | diff --git a/tests/test_utils.py b/tests/test_utils.py
|
| 60 | index e9903e136a..6db524b514 100644
|
| 61 | |
| 62 | |
| 63 | @@ -1,4 +1,4 @@
|
| 64 | -from mock import Mock
|
| 65 | +from unittest.mock import Mock
|
| 66 |
|
| 67 |
|
| 68 | class MockThread(Mock):
|