diff --git a/requirements-dev.txt b/requirements-dev.txt index b8f6dde06..cc9112252 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,6 @@ pytest-django pytest-cov factory-boy requests -mock pygments vobject diff --git a/tests/db/fields/test_uniq_field_mixin_compat.py b/tests/db/fields/test_uniq_field_mixin_compat.py index 5f4fbe576..2d2c5812a 100644 --- a/tests/db/fields/test_uniq_field_mixin_compat.py +++ b/tests/db/fields/test_uniq_field_mixin_compat.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -try: - from unittest import mock -except ImportError: - import mock +from unittest import mock -import six from django.db import models from django.test import TestCase from tests.testapp.models import ( @@ -20,7 +16,7 @@ def setUp(self): class MockField(UniqueFieldMixin): def __init__(self, **kwargs): - for key, value in six.iteritems(kwargs): + for key, value in kwargs.items(): setattr(self, key, value) self.uniq_field = MockField( diff --git a/tests/management/commands/test_clear_cache.py b/tests/management/commands/test_clear_cache.py index 9506bde48..59adffbd4 100644 --- a/tests/management/commands/test_clear_cache.py +++ b/tests/management/commands/test_clear_cache.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock import os from io import StringIO diff --git a/tests/test_management_command.py b/tests/test_management_command.py index 92481105f..b0b4a7719 100644 --- a/tests/test_management_command.py +++ b/tests/test_management_command.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import os -import mock +from unittest import mock import logging import importlib diff --git a/tests/test_sqldiff.py b/tests/test_sqldiff.py index a652d2fe4..24789c5c9 100644 --- a/tests/test_sqldiff.py +++ b/tests/test_sqldiff.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock import pytest from io import StringIO