Fixes the Django 3.0 six issue

avatar/models.py

@@ -11,7 +11,6 @@ from django.core.files.storage import get_storage_class
 from django.utils.module_loading import import_string
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import force_text
-from django.utils import six
 from django.db.models import signals
 
 from avatar.conf import settings
@@ -22,6 +21,12 @@ try:
 except ImportError:
     now = datetime.datetime.now
 
+# Issue 182: six no longer included with Django 3.0
+try:
+    from django.utils import six
+except ImportError:
+    import six
+
 
 avatar_storage = get_storage_class(settings.AVATAR_STORAGE)()
 

avatar/utils.py

@@ -1,7 +1,6 @@
 import hashlib
 
 from django.core.cache import cache
-from django.utils import six
 from django.template.defaultfilters import slugify
 
 try:
@@ -9,6 +8,12 @@ try:
 except ImportError:
     force_bytes = str
 
+# Issue 182: six no longer included with Django 3.0
+try:
+    from django.utils import six
+except ImportError:
+    import six
+
 from django.contrib.auth import get_user_model
 
 from avatar.conf import settings