mirror of
https://github.com/jazzband/django-avatar.git
synced 2026-05-13 01:53:11 +00:00
Use str just in case.
This commit is contained in:
parent
7a32e3bd47
commit
b12bb9f193
3 changed files with 15 additions and 3 deletions
|
|
@ -7,10 +7,14 @@ from django.db import models
|
|||
from django.core.files.base import ContentFile
|
||||
from django.core.files.storage import get_storage_class
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils import six
|
||||
from django.db.models import signals
|
||||
|
||||
try:
|
||||
from django.utils.encoding import force_bytes
|
||||
except ImportError:
|
||||
force_bytes = str
|
||||
|
||||
from avatar.util import get_username
|
||||
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -10,9 +10,13 @@ from django import template
|
|||
from django.core.urlresolvers import reverse
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils import six
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
try:
|
||||
from django.utils.encoding import force_bytes
|
||||
except ImportError:
|
||||
force_bytes = str
|
||||
|
||||
from avatar.settings import (AVATAR_GRAVATAR_BACKUP, AVATAR_GRAVATAR_DEFAULT,
|
||||
AVATAR_DEFAULT_SIZE, AVATAR_GRAVATAR_BASE_URL)
|
||||
from avatar.util import (get_primary_avatar, get_default_avatar_url,
|
||||
|
|
|
|||
|
|
@ -2,10 +2,14 @@ import hashlib
|
|||
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils import six
|
||||
from django.template.defaultfilters import slugify
|
||||
|
||||
try:
|
||||
from django.utils.encoding import force_bytes
|
||||
except ImportError:
|
||||
force_bytes = str
|
||||
|
||||
try:
|
||||
from django.contrib.auth import get_user_model
|
||||
except ImportError:
|
||||
|
|
|
|||
Loading…
Reference in a new issue