diff --git a/tests/integration/test_exporter_api.py b/tests/integration/test_exporter_api.py index 060b1c59..edf333e4 100644 --- a/tests/integration/test_exporter_api.py +++ b/tests/integration/test_exporter_api.py @@ -15,11 +15,11 @@ # along with this program. If not, see . import pytest -import json from django.core.urlresolvers import reverse from .. import factories as f +from taiga.base.utils import json pytestmark = pytest.mark.django_db diff --git a/tests/integration/test_history.py b/tests/integration/test_history.py index 690b724e..f8f30998 100644 --- a/tests/integration/test_history.py +++ b/tests/integration/test_history.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import json import pytest from unittest.mock import MagicMock from unittest.mock import patch @@ -23,6 +22,7 @@ from unittest.mock import patch from django.core.urlresolvers import reverse from .. import factories as f +from taiga.base.utils import json from taiga.projects.history import services from taiga.projects.history.models import HistoryEntry from taiga.projects.history.choices import HistoryType diff --git a/tests/integration/test_hooks_bitbucket.py b/tests/integration/test_hooks_bitbucket.py index 2fd53059..f071400e 100644 --- a/tests/integration/test_hooks_bitbucket.py +++ b/tests/integration/test_hooks_bitbucket.py @@ -1,5 +1,4 @@ import pytest -import json import urllib from unittest import mock @@ -8,6 +7,7 @@ from django.core.urlresolvers import reverse from django.core import mail from django.conf import settings +from taiga.base.utils import json from taiga.hooks.bitbucket import event_hooks from taiga.hooks.bitbucket.api import BitBucketViewSet from taiga.hooks.exceptions import ActionSyntaxException diff --git a/tests/integration/test_hooks_github.py b/tests/integration/test_hooks_github.py index bd5103ae..08a33bbd 100644 --- a/tests/integration/test_hooks_github.py +++ b/tests/integration/test_hooks_github.py @@ -1,11 +1,11 @@ import pytest -import json from unittest import mock from django.core.urlresolvers import reverse from django.core import mail +from taiga.base.utils import json from taiga.hooks.github import event_hooks from taiga.hooks.github.api import GitHubViewSet from taiga.hooks.exceptions import ActionSyntaxException diff --git a/tests/integration/test_hooks_gitlab.py b/tests/integration/test_hooks_gitlab.py index adf3970c..2bb4305a 100644 --- a/tests/integration/test_hooks_gitlab.py +++ b/tests/integration/test_hooks_gitlab.py @@ -1,11 +1,11 @@ import pytest -import json from unittest import mock from django.core.urlresolvers import reverse from django.core import mail +from taiga.base.utils import json from taiga.hooks.gitlab import event_hooks from taiga.hooks.gitlab.api import GitLabViewSet from taiga.hooks.exceptions import ActionSyntaxException diff --git a/tests/integration/test_importer_api.py b/tests/integration/test_importer_api.py index d458a1a6..2b2ad9fa 100644 --- a/tests/integration/test_importer_api.py +++ b/tests/integration/test_importer_api.py @@ -15,7 +15,6 @@ # along with this program. If not, see . import pytest -import json import base64 import datetime @@ -24,6 +23,7 @@ from django.core.files.base import ContentFile from .. import factories as f +from taiga.base.utils import json from taiga.projects.models import Project from taiga.projects.issues.models import Issue from taiga.projects.userstories.models import UserStory diff --git a/tests/integration/test_issues.py b/tests/integration/test_issues.py index 5a3b4ac7..c415b492 100644 --- a/tests/integration/test_issues.py +++ b/tests/integration/test_issues.py @@ -1,5 +1,4 @@ from unittest import mock -import json from django.core.urlresolvers import reverse diff --git a/tests/integration/test_notifications.py b/tests/integration/test_notifications.py index 13e641c3..f100af22 100644 --- a/tests/integration/test_notifications.py +++ b/tests/integration/test_notifications.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import json import pytest import time from unittest.mock import MagicMock, patch @@ -24,6 +23,7 @@ from django.core.urlresolvers import reverse from django.apps import apps from .. import factories as f +from taiga.base.utils import json from taiga.projects.notifications import services from taiga.projects.notifications import models from taiga.projects.notifications.choices import NotifyLevel diff --git a/tests/integration/test_timeline.py b/tests/integration/test_timeline.py index db510ec4..d3f84a3b 100644 --- a/tests/integration/test_timeline.py +++ b/tests/integration/test_timeline.py @@ -15,11 +15,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import json import pytest from .. import factories +from taiga.base.utils import json from taiga.timeline import service from taiga.timeline.models import Timeline diff --git a/tests/integration/test_users.py b/tests/integration/test_users.py index 7c749cdb..38b03ba1 100644 --- a/tests/integration/test_users.py +++ b/tests/integration/test_users.py @@ -1,11 +1,11 @@ import pytest -import json from tempfile import NamedTemporaryFile from django.core.urlresolvers import reverse from .. import factories as f +from taiga.base.utils import json from taiga.users import models from taiga.auth.tokens import get_token_for_user diff --git a/tests/integration/test_userstorage_api.py b/tests/integration/test_userstorage_api.py index ad0fe680..fb2eef3f 100644 --- a/tests/integration/test_userstorage_api.py +++ b/tests/integration/test_userstorage_api.py @@ -15,12 +15,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import json import pytest from django.core.urlresolvers import reverse from .. import factories +from taiga.base.utils import json pytestmark = pytest.mark.django_db diff --git a/tests/utils.py b/tests/utils.py index 6a437129..e30c90d0 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -15,9 +15,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . import functools -import json from django.db.models import signals +from taiga.base.utils import json def signals_switch():