From 6a2c361502c19f46ab1f3d9d8fc5f73a55eb4dc9 Mon Sep 17 00:00:00 2001
From: bastb <bas@tenberge-ict.nl>
Date: Tue, 3 Dec 2019 15:37:01 +0100
Subject: [PATCH] Additional fixes for Django 3

---
 avatar/admin.py                    | 6 +++++-
 avatar/forms.py                    | 6 +++++-
 avatar/templatetags/avatar_tags.py | 6 +++++-
 avatar/views.py                    | 7 +++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/avatar/admin.py b/avatar/admin.py
index 98d833e..a47f74b 100644
--- a/avatar/admin.py
+++ b/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
diff --git a/avatar/forms.py b/avatar/forms.py
index c52b42a..4c6b6e9 100644
--- a/avatar/forms.py
+++ b/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
 
diff --git a/avatar/templatetags/avatar_tags.py b/avatar/templatetags/avatar_tags.py
index 7626e0c..b8beb75 100644
--- a/avatar/templatetags/avatar_tags.py
+++ b/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
 
diff --git a/avatar/views.py b/avatar/views.py
index 4796a42..8221b2f 100644
--- a/avatar/views.py
+++ b/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