Use taiga.base.utils.json instead json

remotes/origin/enhancement/email-actions
David Barragán Merino 2015-01-14 10:54:04 +01:00
parent b04c220451
commit 834d8dfe3f
12 changed files with 11 additions and 12 deletions

View File

@ -15,11 +15,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest import pytest
import json
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from .. import factories as f from .. import factories as f
from taiga.base.utils import json
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db

View File

@ -15,7 +15,6 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import json
import pytest import pytest
from unittest.mock import MagicMock from unittest.mock import MagicMock
from unittest.mock import patch from unittest.mock import patch
@ -23,6 +22,7 @@ from unittest.mock import patch
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from .. import factories as f from .. import factories as f
from taiga.base.utils import json
from taiga.projects.history import services from taiga.projects.history import services
from taiga.projects.history.models import HistoryEntry from taiga.projects.history.models import HistoryEntry
from taiga.projects.history.choices import HistoryType from taiga.projects.history.choices import HistoryType

View File

@ -1,5 +1,4 @@
import pytest import pytest
import json
import urllib import urllib
from unittest import mock from unittest import mock
@ -8,6 +7,7 @@ from django.core.urlresolvers import reverse
from django.core import mail from django.core import mail
from django.conf import settings from django.conf import settings
from taiga.base.utils import json
from taiga.hooks.bitbucket import event_hooks from taiga.hooks.bitbucket import event_hooks
from taiga.hooks.bitbucket.api import BitBucketViewSet from taiga.hooks.bitbucket.api import BitBucketViewSet
from taiga.hooks.exceptions import ActionSyntaxException from taiga.hooks.exceptions import ActionSyntaxException

View File

@ -1,11 +1,11 @@
import pytest import pytest
import json
from unittest import mock from unittest import mock
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core import mail from django.core import mail
from taiga.base.utils import json
from taiga.hooks.github import event_hooks from taiga.hooks.github import event_hooks
from taiga.hooks.github.api import GitHubViewSet from taiga.hooks.github.api import GitHubViewSet
from taiga.hooks.exceptions import ActionSyntaxException from taiga.hooks.exceptions import ActionSyntaxException

View File

@ -1,11 +1,11 @@
import pytest import pytest
import json
from unittest import mock from unittest import mock
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core import mail from django.core import mail
from taiga.base.utils import json
from taiga.hooks.gitlab import event_hooks from taiga.hooks.gitlab import event_hooks
from taiga.hooks.gitlab.api import GitLabViewSet from taiga.hooks.gitlab.api import GitLabViewSet
from taiga.hooks.exceptions import ActionSyntaxException from taiga.hooks.exceptions import ActionSyntaxException

View File

@ -15,7 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest import pytest
import json
import base64 import base64
import datetime import datetime
@ -24,6 +23,7 @@ from django.core.files.base import ContentFile
from .. import factories as f from .. import factories as f
from taiga.base.utils import json
from taiga.projects.models import Project from taiga.projects.models import Project
from taiga.projects.issues.models import Issue from taiga.projects.issues.models import Issue
from taiga.projects.userstories.models import UserStory from taiga.projects.userstories.models import UserStory

View File

@ -1,5 +1,4 @@
from unittest import mock from unittest import mock
import json
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse

View File

@ -15,7 +15,6 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import json
import pytest import pytest
import time import time
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
@ -24,6 +23,7 @@ from django.core.urlresolvers import reverse
from django.apps import apps from django.apps import apps
from .. import factories as f from .. import factories as f
from taiga.base.utils import json
from taiga.projects.notifications import services from taiga.projects.notifications import services
from taiga.projects.notifications import models from taiga.projects.notifications import models
from taiga.projects.notifications.choices import NotifyLevel from taiga.projects.notifications.choices import NotifyLevel

View File

@ -15,11 +15,11 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import json
import pytest import pytest
from .. import factories from .. import factories
from taiga.base.utils import json
from taiga.timeline import service from taiga.timeline import service
from taiga.timeline.models import Timeline from taiga.timeline.models import Timeline

View File

@ -1,11 +1,11 @@
import pytest import pytest
import json
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from .. import factories as f from .. import factories as f
from taiga.base.utils import json
from taiga.users import models from taiga.users import models
from taiga.auth.tokens import get_token_for_user from taiga.auth.tokens import get_token_for_user

View File

@ -15,12 +15,12 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import json
import pytest import pytest
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from .. import factories from .. import factories
from taiga.base.utils import json
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db

View File

@ -15,9 +15,9 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import functools import functools
import json
from django.db.models import signals from django.db.models import signals
from taiga.base.utils import json
def signals_switch(): def signals_switch():