Skip to content

Commit

Permalink
prepare 0.1.4; minor django 1.4.x fixes in the user module
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Oct 2, 2015
1 parent 109129a commit fe3b36e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 23 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ are used for versioning (schema follows below):
0.3.2 to 0.4).
- All backwards incompatible changes are mentioned in this document.

0.1.4
-----
2015-08-25

- Minor Django 1.4 fixes in the `user` module.

0.1.3
-----
2015-08-25
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
except:
readme = ''

version = '0.1.3'
version = '0.1.4'

install_requires = [
'Django',
Expand Down
47 changes: 25 additions & 22 deletions src/nine/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,31 @@
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured

from nine.versions import DJANGO_LTE_1_6, DJANGO_GTE_1_7
from nine.versions import DJANGO_LTE_1_4, DJANGO_LTE_1_6, DJANGO_GTE_1_7

# Cannot use contrib.auth.get_user_model() at compile time.
user_app_name, user_model_name = settings.AUTH_USER_MODEL.rsplit('.', 1)
User = None
if DJANGO_LTE_1_4:
from django.contrib.auth.models import User
else:
# Cannot use contrib.auth.get_user_model() at compile time.
user_app_name, user_model_name = settings.AUTH_USER_MODEL.rsplit('.', 1)
User = None

if DJANGO_LTE_1_6:
for app in settings.INSTALLED_APPS:
if app.endswith(user_app_name):
user_app_models = importlib.import_module(app + ".models")
User = getattr(user_app_models, user_model_name)
break
elif DJANGO_GTE_1_7:
from django.apps import apps
try:
User = apps.get_registered_model(user_app_name, user_model_name)
except KeyError:
pass
if DJANGO_LTE_1_6:
for app in settings.INSTALLED_APPS:
if app.endswith(user_app_name):
user_app_models = importlib.import_module(app + ".models")
User = getattr(user_app_models, user_model_name)
break
elif DJANGO_GTE_1_7:
from django.apps import apps
try:
User = apps.get_registered_model(user_app_name, user_model_name)
except KeyError:
pass

if User is None:
raise ImproperlyConfigured(
"You have defined a custom user model {0}, but the app {1} is not in "
"``settings.INSTALLED_APPS``"
"".format(settings.AUTH_USER_MODEL, user_app_name)
)
if User is None:
raise ImproperlyConfigured(
"You have defined a custom user model {0}, but the app {1} is not in "
"``settings.INSTALLED_APPS``"
"".format(settings.AUTH_USER_MODEL, user_app_name)
)

0 comments on commit fe3b36e

Please sign in to comment.