Hopiu/django-avatar
1
0
Fork 0
mirror of https://github.com/jazzband/django-avatar.git synced 2026-03-16 22:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove unnecessary try/except on import

Browse source
This commit is contained in:
Grant McConnaughey 2015-10-23 09:08:19 -05:00
parent 1cad3fc8aa
commit b14fe1624a
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.rst
View file

@ -4,9 +4,9 @@ Changelog
* 2.2 (Not released)
* Added Python 3.5 support
* Added Django 1.9 support
* Added database-level enforcement of unique user/primary pair in Avatar model.
* Removed Python 2.6 support
* Removed Django 1.4, 1.5, and 1.6 support
* Added database-level enforcement of unique user/primary pair in Avatar model.
* 2.1.1 (August 10, 2015)
* Added Polish locale

17
avatar/util.py
View file

@ -9,17 +9,7 @@ try:
except ImportError:
force_bytes = str
try:
from django.contrib.auth import get_user_model
except ImportError:
from django.contrib.auth.models import User
def get_user_model():
return User
custom_user_model = False
else:
custom_user_model = True
from django.contrib.auth import get_user_model
from avatar.conf import settings
@ -37,10 +27,7 @@ def get_username(user):
def get_user(username):
""" Return user from a username/ish identifier """
if custom_user_model:
return get_user_model().objects.get_by_natural_key(username)
else:
return get_user_model().objects.get(username=username)
return get_user_model().objects.get_by_natural_key(username)
def get_cache_key(user_or_username, size, prefix):