Additional fixes for Django 3

avatar/admin.py

@@ -1,6 +1,10 @@
 from django.contrib import admin
+# Issue 182: six no longer included with Django 3.0
+try:
+    from django.utils import six
+except ImportError:
+    import six
 from django.utils.translation import ugettext_lazy as _
-from django.utils import six
 from django.template.loader import render_to_string
 
 from avatar.models import Avatar

avatar/forms.py

@@ -2,8 +2,12 @@ import os
 
 from django import forms
 from django.forms import widgets
-from django.utils import six
 from django.utils.safestring import mark_safe
+# Issue 182: six no longer included with Django 3.0
+try:
+    from django.utils import six
+except ImportError:
+    import six
 from django.utils.translation import ugettext_lazy as _
 from django.template.defaultfilters import filesizeformat
 

avatar/templatetags/avatar_tags.py

@@ -5,7 +5,11 @@ except ImportError:
     # For Django < 1.10
     from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
-from django.utils import six
+# Issue 182: six no longer included with Django 3.0
+try:
+    from django.utils import six
+except ImportError:
+    import six
 from django.utils.translation import ugettext as _
 from django.utils.module_loading import import_string
 

avatar/views.py

@@ -1,7 +1,10 @@
 from django.shortcuts import render, redirect
-from django.utils import six
 from django.utils.translation import ugettext as _
-
+# Issue 182: six no longer included with Django 3.0
+try:
+    from django.utils import six
+except ImportError:
+    import six
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required