Update import style

A bit more verbose but significantly easier to understand what is available in
the namespace and where it comes from

organizations/abstract.py

@@ -29,14 +29,22 @@
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+
 try:
     import six
 except ImportError:
     from django.utils import six
 
-from .base import OrgMeta, AbstractBaseOrganization, AbstractBaseOrganizationUser, AbstractBaseOrganizationOwner
-from .fields import SlugField, AutoCreatedField, AutoLastModifiedField
-from .signals import user_added, user_removed, owner_changed
+from organizations.base import OrgMeta
+from organizations.base import AbstractBaseOrganization
+from organizations.base import AbstractBaseOrganizationUser
+from organizations.base import AbstractBaseOrganizationOwner
+from organizations.fields import SlugField
+from organizations.fields import AutoCreatedField
+from organizations.fields import AutoLastModifiedField
+from organizations.signals import user_added
+from organizations.signals import user_removed
+from organizations.signals import owner_changed
 
 USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 ORGS_TIMESTAMPED_MODEL = getattr(settings, 'ORGS_TIMESTAMPED_MODEL', None)

organizations/admin.py

@@ -25,11 +25,13 @@
 
 from django.contrib import admin
 
-from .base_admin import (BaseOwnerInline,
-                         BaseOrganizationAdmin,
-                         BaseOrganizationUserAdmin,
-                         BaseOrganizationOwnerAdmin)
-from .models import Organization, OrganizationUser, OrganizationOwner
+from organizations.base_admin import BaseOrganizationAdmin
+from organizations.base_admin import BaseOrganizationOwnerAdmin
+from organizations.base_admin import BaseOrganizationUserAdmin
+from organizations.base_admin import BaseOwnerInline
+from organizations.models import Organization
+from organizations.models import OrganizationOwner
+from organizations.models import OrganizationUser
 
 
 class OwnerInline(BaseOwnerInline):

organizations/app_settings.py

@@ -26,7 +26,7 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 
-from .utils import model_field_attr
+from organizations.utils import model_field_attr
 
 
 ORGS_INVITATION_BACKEND = getattr(settings, 'INVITATION_BACKEND',

organizations/base.py

@@ -25,15 +25,17 @@
 
 from django.conf import settings
 from django.db import models
-from django.db.models.fields import FieldDoesNotExist
 from django.db.models.base import ModelBase
+from django.db.models.fields import FieldDoesNotExist
+
 try:
     import six
 except ImportError:
     from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
-from .managers import OrgManager, ActiveOrgManager
+from organizations.managers import ActiveOrgManager
+from organizations.managers import OrgManager
 
 USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 

organizations/forms.py

@@ -28,9 +28,10 @@
 from django.contrib.sites.shortcuts import get_current_site
 from django.utils.translation import ugettext_lazy as _
 
-from .models import Organization, OrganizationUser
-from .utils import create_organization
-from .backends import invitation_backend
+from organizations.backends import invitation_backend
+from organizations.models import Organization
+from organizations.models import OrganizationUser
+from organizations.utils import create_organization
 
 
 class OrganizationForm(forms.ModelForm):

organizations/mixins.py

@@ -27,7 +27,8 @@
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _
 
-from .models import Organization, OrganizationUser
+from organizations.models import Organization
+from organizations.models import OrganizationUser
 
 
 class OrganizationMixin(object):

organizations/models.py

@@ -23,9 +23,9 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from .abstract import (AbstractOrganization,
-                       AbstractOrganizationUser,
-                       AbstractOrganizationOwner)
+from organizations.abstract import AbstractOrganization
+from organizations.abstract import AbstractOrganizationOwner
+from organizations.abstract import AbstractOrganizationUser
 
 
 class Organization(AbstractOrganization):

organizations/urls.py

@@ -26,45 +26,44 @@
 from django.conf.urls import url
 from django.contrib.auth.decorators import login_required
 
-from .views import (OrganizationList, OrganizationDetail,
-        OrganizationUpdate, OrganizationDelete, OrganizationCreate,
-        OrganizationUserList, OrganizationUserDetail, OrganizationUserUpdate,
-        OrganizationUserCreate, OrganizationUserRemind, OrganizationUserDelete)
+from organizations import views
 
 
 urlpatterns = [
     # Organization URLs
-    url(r'^$', view=login_required(OrganizationList.as_view()),
+    url(r'^$',
+        view=login_required(views.OrganizationList.as_view()),
         name="organization_list"),
-    url(r'^add/$', view=login_required(OrganizationCreate.as_view()),
+    url(r'^add/$',
+        view=login_required(views.OrganizationCreate.as_view()),
         name="organization_add"),
     url(r'^(?P<organization_pk>[\d]+)/$',
-        view=login_required(OrganizationDetail.as_view()),
+        view=login_required(views.OrganizationDetail.as_view()),
         name="organization_detail"),
     url(r'^(?P<organization_pk>[\d]+)/edit/$',
-        view=login_required(OrganizationUpdate.as_view()),
+        view=login_required(views.OrganizationUpdate.as_view()),
         name="organization_edit"),
     url(r'^(?P<organization_pk>[\d]+)/delete/$',
-        view=login_required(OrganizationDelete.as_view()),
+        view=login_required(views.OrganizationDelete.as_view()),
         name="organization_delete"),
 
     # Organization user URLs
     url(r'^(?P<organization_pk>[\d]+)/people/$',
-        view=login_required(OrganizationUserList.as_view()),
+        view=login_required(views.OrganizationUserList.as_view()),
         name="organization_user_list"),
     url(r'^(?P<organization_pk>[\d]+)/people/add/$',
-        view=login_required(OrganizationUserCreate.as_view()),
+        view=login_required(views.OrganizationUserCreate.as_view()),
         name="organization_user_add"),
     url(r'^(?P<organization_pk>[\d]+)/people/(?P<user_pk>[\d]+)/remind/$',
-        view=login_required(OrganizationUserRemind.as_view()),
+        view=login_required(views.OrganizationUserRemind.as_view()),
         name="organization_user_remind"),
     url(r'^(?P<organization_pk>[\d]+)/people/(?P<user_pk>[\d]+)/$',
-        view=login_required(OrganizationUserDetail.as_view()),
+        view=login_required(views.OrganizationUserDetail.as_view()),
         name="organization_user_detail"),
     url(r'^(?P<organization_pk>[\d]+)/people/(?P<user_pk>[\d]+)/edit/$',
-        view=login_required(OrganizationUserUpdate.as_view()),
+        view=login_required(views.OrganizationUserUpdate.as_view()),
         name="organization_user_edit"),
     url(r'^(?P<organization_pk>[\d]+)/people/(?P<user_pk>[\d]+)/delete/$',
-        view=login_required(OrganizationUserDelete.as_view()),
+        view=login_required(views.OrganizationUserDelete.as_view()),
         name="organization_user_delete"),
 ]

organizations/views.py

@@ -26,18 +26,30 @@
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseBadRequest
-from django.shortcuts import render, redirect
+from django.shortcuts import redirect
+from django.shortcuts import render
 from django.utils.translation import ugettext as _
-from django.views.generic import (ListView, DetailView, UpdateView, CreateView,
-        DeleteView, FormView)
-
-from .backends import invitation_backend, registration_backend
-from .forms import (OrganizationForm, OrganizationUserForm,
-        OrganizationUserAddForm, OrganizationAddForm, SignUpForm)
-from .mixins import (OrganizationMixin, OrganizationUserMixin,
-        MembershipRequiredMixin, AdminRequiredMixin, OwnerRequiredMixin)
-from .models import Organization
-from .utils import create_organization
+from django.views.generic import CreateView
+from django.views.generic import DeleteView
+from django.views.generic import DetailView
+from django.views.generic import FormView
+from django.views.generic import ListView
+from django.views.generic import UpdateView
+
+from organizations.backends import invitation_backend
+from organizations.backends import registration_backend
+from organizations.forms import OrganizationAddForm
+from organizations.forms import OrganizationForm
+from organizations.forms import OrganizationUserAddForm
+from organizations.forms import OrganizationUserForm
+from organizations.forms import SignUpForm
+from organizations.mixins import AdminRequiredMixin
+from organizations.mixins import MembershipRequiredMixin
+from organizations.mixins import OrganizationMixin
+from organizations.mixins import OrganizationUserMixin
+from organizations.mixins import OwnerRequiredMixin
+from organizations.models import Organization
+from organizations.utils import create_organization
 
 
 class BaseOrganizationList(ListView):

tests/test_forms.py

@@ -2,10 +2,11 @@
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 
-from organizations.forms import (OrganizationForm, OrganizationUserForm,
-        OrganizationUserAddForm)
+from organizations.forms import OrganizationForm
+from organizations.forms import OrganizationUserAddForm
+from organizations.forms import OrganizationUserForm
 from organizations.models import Organization
-from .utils import request_factory_login
+from tests.utils import request_factory_login
 
 
 @override_settings(USE_TZ=True)

tests/test_mixins.py

@@ -5,10 +5,14 @@
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
 
-from organizations.models import Organization, OrganizationUser
-from organizations.mixins import (OrganizationMixin, OrganizationUserMixin,
-        MembershipRequiredMixin, AdminRequiredMixin, OwnerRequiredMixin)
-from .utils import request_factory_login
+from organizations.mixins import AdminRequiredMixin
+from organizations.mixins import MembershipRequiredMixin
+from organizations.mixins import OrganizationMixin
+from organizations.mixins import OrganizationUserMixin
+from organizations.mixins import OwnerRequiredMixin
+from organizations.models import Organization
+from organizations.models import OrganizationUser
+from tests.utils import request_factory_login
 
 
 class ViewStub(object):

tests/test_models.py

@@ -2,17 +2,18 @@
 
 from functools import partial
 
-from django.db import IntegrityError
 from django.contrib.auth.models import User
+from django.db import IntegrityError
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from organizations.models import (Organization, OrganizationUser,
-        OrganizationOwner)
+from organizations.models import Organization
+from organizations.models import OrganizationOwner
+from organizations.models import OrganizationUser
 from organizations.utils import create_organization
+from test_abstract.models import CustomOrganization
 from test_accounts.models import Account
 from test_custom.models import Team
-from test_abstract.models import CustomOrganization
 
 
 @override_settings(USE_TZ=True)

tests/test_signals.py

@@ -1,13 +1,13 @@
-from mock import call
-from mock_django.signals import mock_signal_receiver
-
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings
+from mock import call
+from mock_django.signals import mock_signal_receiver
 
 from organizations.models import Organization
-from organizations.signals import (user_added, user_removed,
-                                   owner_changed)
+from organizations.signals import owner_changed
+from organizations.signals import user_added
+from organizations.signals import user_removed
 
 
 @override_settings(USE_TZ=True)

tests/test_templatetags.py

@@ -1,6 +1,6 @@
-from django.test import TestCase
-from django.template import Template, Context
 from django.contrib.auth.models import User
+from django.template import Template, Context
+from django.test import TestCase
 from django.test.utils import override_settings
 
 from organizations.models import Organization

tests/test_utils.py

@@ -1,13 +1,14 @@
 from functools import partial
 
-from django.test import TestCase
 from django.contrib.auth.models import User
+from django.test import TestCase
 from django.test.utils import override_settings
 
 from organizations.models import Organization
-from organizations.utils import create_organization, model_field_attr
-from test_accounts.models import Account
+from organizations.utils import create_organization
+from organizations.utils import model_field_attr
 from test_abstract.models import CustomOrganization
+from test_accounts.models import Account
 
 
 @override_settings(USE_TZ=True)