Skip to content

Commit

Permalink
Fix some circuluar references
Browse files Browse the repository at this point in the history
  • Loading branch information
paltman committed Jul 10, 2014
1 parent 2489244 commit 0062a7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion idios/models.py
Expand Up @@ -7,7 +7,6 @@

from account.signals import user_logged_in

from .conf import settings
from .utils import get_profile_model, get_profile_form


Expand All @@ -32,6 +31,7 @@ def __unicode__(self):
return self.user.username

def get_absolute_url(self):
from .conf import settings
if len(settings.IDIOS_PROFILE_MODULES) > 1:
# @@@ using PK here is kind of ugly. the alternative is to
# generate a unique slug for each profile, which is tricky
Expand Down
4 changes: 2 additions & 2 deletions idios/utils.py
Expand Up @@ -11,8 +11,6 @@

from django.contrib.auth.models import SiteProfileNotAvailable

from .conf import settings


def get_profile_base():
"""
Expand All @@ -34,6 +32,7 @@ def get_profile_base():
raise ``django.contrib.auth.models.SiteProfileNotAvailable``.
"""
from .conf import settings
if len(settings.IDIOS_PROFILE_MODULES) > 1 and settings.IDIOS_PROFILE_BASE:
model = settings.IDIOS_PROFILE_BASE
else:
Expand All @@ -58,6 +57,7 @@ def get_profile_model(profile_slug=None):
``django.contrib.auth.models.SiteProfileNotAvailable``.
"""
from .conf import settings
model = None
if profile_slug is None and len(settings.IDIOS_PROFILE_MODULES) > 0:
model = settings.IDIOS_PROFILE_MODULES[0]
Expand Down

0 comments on commit 0062a7f

Please sign in to comment.