2018-09-04 16:59:11 +00:00
|
|
|
--- a/tests/test_ticking.py
|
|
|
|
+++ b/tests/test_ticking.py
|
2019-07-02 16:21:46 +00:00
|
|
|
@@ -1,7 +1,10 @@
|
2018-09-04 16:59:11 +00:00
|
|
|
import datetime
|
|
|
|
import time
|
|
|
|
-import mock
|
2019-07-02 16:21:46 +00:00
|
|
|
import pytest
|
2018-09-04 16:59:11 +00:00
|
|
|
+try:
|
|
|
|
+ import mock
|
|
|
|
+except ImportError:
|
|
|
|
+ import unittest.mock as mock
|
|
|
|
|
|
|
|
from freezegun import freeze_time
|
|
|
|
from tests import utils
|
|
|
|
--- a/tests/test_utils.py
|
|
|
|
+++ b/tests/test_utils.py
|
2019-07-02 16:21:46 +00:00
|
|
|
@@ -1,6 +1,9 @@
|
|
|
|
from unittest import SkipTest
|
|
|
|
|
2018-09-04 16:59:11 +00:00
|
|
|
-import mock
|
|
|
|
+try:
|
|
|
|
+ import mock
|
|
|
|
+except ImportError:
|
|
|
|
+ import unittest.mock as mock
|
|
|
|
|
|
|
|
from freezegun import api
|
2019-07-02 16:21:46 +00:00
|
|
|
from tests import utils
|