10000 Drop use of mock and six by s-t-e-v-e-n-k · Pull Request #1723 · django-extensions/django-extensions · GitHub
[go: up one dir, main page]

Skip to content

Drop use of mock and six #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ pytest-django
pytest-cov
factory-boy
requests
mock
pygments
vobject

Expand Down
8 changes: 2 additions & 6 deletions tests/db/fields/test_uniq_field_mixin_compat.py
Original file line number Diff line number Diff line change
@@ -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 (
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/management/commands/test_clear_cache.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
import mock
from unittest import mock
import os
from io import StringIO

Expand Down
2 changes: 1 addition & 1 deletion tests/test_management_command.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import os
import mock
from unittest import mock
import logging
import importlib

Expand Down
2 changes: 1 addition & 1 deletion tests/test_sqldiff.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
import mock
from unittest import mock
import pytest
from io import StringIO

Expand Down
0