diff --git a/glance/tests/unit/test_cache_middleware.py b/glance/tests/unit/test_cache_middleware.py index 8d3e13250b..063b1aa001 100644 --- a/glance/tests/unit/test_cache_middleware.py +++ b/glance/tests/unit/test_cache_middleware.py @@ -12,7 +12,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from mock import patch +from unittest.mock import patch + from oslo_policy import policy # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import http_client as http diff --git a/glance/tests/unit/test_quota.py b/glance/tests/unit/test_quota.py index ef2f5ba712..04da4943ba 100644 --- a/glance/tests/unit/test_quota.py +++ b/glance/tests/unit/test_quota.py @@ -14,9 +14,9 @@ # under the License. import copy from unittest import mock +from unittest.mock import patch import uuid -from mock import patch from oslo_utils import encodeutils from oslo_utils import units diff --git a/glance/tests/unit/test_scrubber.py b/glance/tests/unit/test_scrubber.py index 9d1d1d5ed0..bc2e7c50b5 100644 --- a/glance/tests/unit/test_scrubber.py +++ b/glance/tests/unit/test_scrubber.py @@ -14,10 +14,10 @@ # under the License. from unittest import mock +from unittest.mock import patch import uuid import glance_store -from mock import patch from oslo_config import cfg # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/lower-constraints.txt b/lower-constraints.txt index ad71380a68..240dbe99dc 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -50,7 +50,6 @@ lxml==4.1.1 Mako==1.0.7 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 mox3==0.25.0 msgpack==0.5.6 netaddr==0.7.19