Skip to content

Commit

Permalink
Fix unittest mock imports that triggered the linter
Browse files Browse the repository at this point in the history
  • Loading branch information
lnagel authored and ad-m committed May 6, 2020
1 parent db937f3 commit 17f6a1e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
import mock
from unittest import mock
from guardian.conf import settings as guardian_settings
from guardian.ctypes import get_content_type

Expand Down
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from guardian.compat import get_user_model_path
from guardian.compat import get_user_permission_full_codename
import mock
from unittest import mock
from guardian.decorators import permission_required, permission_required_or_403, permission_required_or_404
from guardian.exceptions import GuardianError
from guardian.exceptions import WrongAppError
Expand Down
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.contrib.sessions.models import Session
from django.test import TestCase, override_settings

import mock
from unittest import mock
from guardian.management import create_anonymous_user
from guardian.utils import get_anonymous_user

Expand Down
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_managers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import warnings

import mock
from unittest import mock
from django.test import TestCase
from guardian.managers import UserObjectPermissionManager
from guardian.managers import GroupObjectPermissionManager
Expand Down
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from django.views.generic import ListView

from guardian.shortcuts import assign_perm
import mock
from unittest import mock
from guardian.mixins import LoginRequiredMixin
from guardian.mixins import PermissionRequiredMixin
from guardian.mixins import PermissionListMixin
Expand Down
2 changes: 1 addition & 1 deletion guardian/testapp/tests/test_other.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import mock
from unittest import mock
import unittest

from django.contrib.auth import get_user_model
Expand Down

0 comments on commit 17f6a1e

Please sign in to comment.