Merge pull request #183 from bastbnl/bastbnl-patch-182

Fixes the Django 3.0 `six` issue

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,13 @@ 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
 
@@ -20,7 +25,6 @@ def avatar_img(avatar, size):
 
 
 class UploadAvatarForm(forms.Form):
-
     avatar = forms.ImageField(label=_("avatar"))
 
     def __init__(self, *args, **kwargs):
@@ -36,21 +40,19 @@ class UploadAvatarForm(forms.Form):
                 valid_exts = ", ".join(settings.AVATAR_ALLOWED_FILE_EXTS)
                 error = _("%(ext)s is an invalid file extension. "
                           "Authorized extensions are : %(valid_exts_list)s")
-                raise forms.ValidationError(error %
-                                            {'ext': ext,
+                raise forms.ValidationError(error
+                                            % {'ext': ext,
                                              'valid_exts_list': valid_exts})
 
         if data.size > settings.AVATAR_MAX_SIZE:
             error = _("Your file is too big (%(size)s), "
                       "the maximum allowed size is %(max_valid_size)s")
-            raise forms.ValidationError(error % {
-                'size': filesizeformat(data.size),
-                'max_valid_size': filesizeformat(settings.AVATAR_MAX_SIZE)
-            })
+            raise forms.ValidationError(error
+                                        % {'size': filesizeformat(data.size),
+                                         'max_valid_size': filesizeformat(settings.AVATAR_MAX_SIZE)})
 
         count = Avatar.objects.filter(user=self.user).count()
-        if (settings.AVATAR_MAX_AVATARS_PER_USER > 1 and
-                count >= settings.AVATAR_MAX_AVATARS_PER_USER):
+        if 1 < settings.AVATAR_MAX_AVATARS_PER_USER <= count:
             error = _("You already have %(nb_avatars)d avatars, "
                       "and the maximum allowed is %(nb_max_avatars)d.")
             raise forms.ValidationError(error % {

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/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/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

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