From 3d932ba569b62d93ec12653c98e3fc0fe04b9557 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.be>
Date: Sat, 22 Mar 2014 16:01:58 +0100
Subject: [PATCH] Fix domains module imports due to previous module relocation.

---
 taiga/base/auth/api.py              | 4 ++--
 taiga/base/auth/tests/tests_auth.py | 2 +-
 taiga/front/__init__.py             | 3 +--
 taiga/projects/api.py               | 2 +-
 taiga/projects/models.py            | 5 +++--
 taiga/projects/permissions.py       | 2 +-
 taiga/projects/tests/__init__.py    | 2 +-
 taiga/routers.py                    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/taiga/base/auth/api.py b/taiga/base/auth/api.py
index 8c0fe707..4a2cbe31 100644
--- a/taiga/base/auth/api.py
+++ b/taiga/base/auth/api.py
@@ -11,8 +11,8 @@ from rest_framework.permissions import AllowAny
 from rest_framework import status, viewsets
 from rest_framework.decorators import list_route
 
-from taiga.base.domains.models import DomainMember
-from taiga.base.domains import get_active_domain
+from taiga.domains.models import DomainMember
+from taiga.domains import get_active_domain
 from taiga.base.users.models import User, Role
 from taiga.base.users.serializers import UserSerializer
 from taiga.base import exceptions as exc
diff --git a/taiga/base/auth/tests/tests_auth.py b/taiga/base/auth/tests/tests_auth.py
index 7072eebe..4adb3f6b 100644
--- a/taiga/base/auth/tests/tests_auth.py
+++ b/taiga/base/auth/tests/tests_auth.py
@@ -18,7 +18,7 @@ from taiga.base import auth
 from taiga.base.users.tests import create_user, create_domain
 from taiga.projects.tests import create_project
 
-from taiga.base.domains.models import Domain, DomainMember
+from taiga.domains.models import Domain, DomainMember
 from taiga.projects.models import Membership
 
 
diff --git a/taiga/front/__init__.py b/taiga/front/__init__.py
index 46ea7231..1222c35b 100644
--- a/taiga/front/__init__.py
+++ b/taiga/front/__init__.py
@@ -3,8 +3,7 @@
 from django.conf import settings
 from django_jinja import library
 
-from taiga.base import domains
-
+from taiga import domains
 
 URLS = {
     "home": "/",
diff --git a/taiga/projects/api.py b/taiga/projects/api.py
index 3becb2d3..fad7b44b 100644
--- a/taiga/projects/api.py
+++ b/taiga/projects/api.py
@@ -15,11 +15,11 @@ from rest_framework import status
 
 from djmail.template_mail import MagicMailBuilder
 
+from taiga.domains import get_active_domain
 from taiga.base import filters
 from taiga.base import exceptions as exc
 from taiga.base.permissions import has_project_perm
 from taiga.base.api import ModelCrudViewSet, ModelListViewSet, RetrieveModelMixin
-from taiga.base.domains import get_active_domain
 from taiga.base.users.models import Role
 from taiga.base.notifications.api import NotificationSenderMixin
 from taiga.projects.aggregates.tags import get_all_tags
diff --git a/taiga/projects/models.py b/taiga/projects/models.py
index 3f270a85..3c0ceca7 100644
--- a/taiga/projects/models.py
+++ b/taiga/projects/models.py
@@ -19,11 +19,12 @@ from django.utils import timezone
 from picklefield.fields import PickledObjectField
 import reversion
 
+from taiga.domains.models import DomainMember
+from taiga.projects.userstories.models import UserStory
 from taiga.base.utils.slug import slugify_uniquely
 from taiga.base.utils.dicts import dict_sum
-from taiga.base.domains.models import DomainMember
 from taiga.base.users.models import Role
-from taiga.projects.userstories.models import UserStory
+
 from . import choices
 
 
diff --git a/taiga/projects/permissions.py b/taiga/projects/permissions.py
index 6005b278..6a753bf3 100644
--- a/taiga/projects/permissions.py
+++ b/taiga/projects/permissions.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from taiga.base.permissions import BasePermission
-from taiga.base.domains import get_active_domain
+from taiga.domains import get_active_domain
 
 
 class ProjectPermission(BasePermission):
diff --git a/taiga/projects/tests/__init__.py b/taiga/projects/tests/__init__.py
index ed8c9719..3a003f3f 100644
--- a/taiga/projects/tests/__init__.py
+++ b/taiga/projects/tests/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from django.db.models.loading import get_model
-from taiga.base.domains import get_active_domain
+from taiga.domains import get_active_domain
 
 
 def create_project(id, owner, save=True):
diff --git a/taiga/routers.py b/taiga/routers.py
index 453eb21c..f26e60c5 100644
--- a/taiga/routers.py
+++ b/taiga/routers.py
@@ -4,12 +4,12 @@ from taiga.base import routers
 from taiga.base.auth.api import AuthViewSet
 from taiga.base.users.api import UsersViewSet, PermissionsViewSet
 from taiga.base.searches.api import SearchViewSet
-from taiga.base.domains.api import DomainViewSet, DomainMembersViewSet
 from taiga.base.resolver.api import ResolverViewSet
 from taiga.projects.api import (ProjectViewSet, MembershipViewSet, InvitationViewSet,
                                     UserStoryStatusViewSet, PointsViewSet, TaskStatusViewSet,
                                     IssueStatusViewSet, IssueTypeViewSet, PriorityViewSet,
                                     SeverityViewSet, ProjectAdminViewSet, RolesViewSet) #, QuestionStatusViewSet)
+from taiga.domains.api import DomainViewSet, DomainMembersViewSet
 from taiga.projects.milestones.api import MilestoneViewSet
 from taiga.projects.userstories.api import UserStoryViewSet, UserStoryAttachmentViewSet
 from taiga.projects.tasks.api import  TaskViewSet, TaskAttachmentViewSet