Merge branch 'django4.0' of github.com:johanneswilm/django-avatar

avatar/admin.py

@@ -1,10 +1,7 @@
+import six
+
 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.translation import gettext_lazy as _
 from django.template.loader import render_to_string
 
 from avatar.models import Avatar

avatar/conf.py

@@ -1,6 +1,7 @@
-from django.conf import settings
 from PIL import Image
 
+from django.conf import settings
+
 from appconf import AppConf
 
 

avatar/forms.py

@@ -1,15 +1,10 @@
 import os
+import six
 
 from django import forms
 from django.forms import widgets
 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.utils.translation import gettext_lazy as _
 from django.template.defaultfilters import filesizeformat
 
 from avatar.conf import settings

avatar/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import django.utils.timezone
 import avatar.models

avatar/migrations/0002_add_verbose_names_to_avatar_fields.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.1 on 2016-09-16 08:50
-from __future__ import unicode_literals
-
 import avatar.models
 from django.conf import settings
 import django.core.files.storage

avatar/migrations/0003_auto_20170827_1345.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-08-27 13:45
-from __future__ import unicode_literals
-
 import avatar.models
 from django.db import migrations
 

avatar/models.py

@@ -2,6 +2,7 @@ import binascii
 import datetime
 import os
 import hashlib
+import six
 from PIL import Image
 
 from django.db import models
@@ -9,24 +10,14 @@ from django.core.files import File
 from django.core.files.base import ContentFile
 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.translation import gettext_lazy as _
+from django.utils.encoding import force_str
 from django.db.models import signals
+from django.utils.timezone import now
 
 from avatar.conf import settings
 from avatar.utils import get_username, force_bytes, invalidate_cache
 
-try:
-    from django.utils.timezone import now
-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)()
 
@@ -39,7 +30,7 @@ def avatar_path_handler(instance=None, filename=None, size=None, ext=None):
     if settings.AVATAR_EXPOSE_USERNAMES:
         tmppath.append(get_username(instance.user))
     else:
-        tmppath.append(force_text(instance.user.pk))
+        tmppath.append(force_str(instance.user.pk))
     if not filename:
         # Filename already stored in database
         filename = instance.avatar.name

avatar/providers.py

@@ -1,11 +1,7 @@
 import hashlib
+from urllib.parse import urljoin, urlencode
 
-try:
-    from urllib.parse import urljoin, urlencode
-except ImportError:
-    from urlparse import urljoin
-    from urllib import urlencode
-
+from django.utils.module_loading import import_string
 
 from avatar.conf import settings
 from avatar.utils import (
@@ -14,7 +10,6 @@ from avatar.utils import (
     get_primary_avatar,
 )
 
-from django.utils.module_loading import import_string
 
 # If the FacebookAvatarProvider is used, a mechanism needs to be defined on
 # how to obtain the user's Facebook UID. This is done via

avatar/signals.py

@@ -1,5 +1,5 @@
 import django.dispatch
 
 
-avatar_updated = django.dispatch.Signal(providing_args=["user", "avatar"])
-avatar_deleted = django.dispatch.Signal(providing_args=["user", "avatar"])
+avatar_updated = django.dispatch.Signal()
+avatar_deleted = django.dispatch.Signal()

avatar/templatetags/avatar_tags.py

@@ -1,16 +1,10 @@
+import six
+
 from django import template
-try:
-    from django.urls import reverse
-except ImportError:
-    # For Django < 1.10
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
+
 from django.template.loader import render_to_string
-# 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.translation import gettext as _
 from django.utils.module_loading import import_string
 
 from avatar.conf import settings

avatar/urls.py

@@ -1,12 +1,12 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from avatar import views
 
 urlpatterns = [
-    url(r'^add/$', views.add, name='avatar_add'),
-    url(r'^change/$', views.change, name='avatar_change'),
-    url(r'^delete/$', views.delete, name='avatar_delete'),
-    url(r'^render_primary/(?P<user>[\w\d\@\.\-_]+)/(?P<size>[\d]+)/$',
+    re_path(r'^add/$', views.add, name='avatar_add'),
+    re_path(r'^change/$', views.change, name='avatar_change'),
+    re_path(r'^delete/$', views.delete, name='avatar_delete'),
+    re_path(r'^render_primary/(?P<user>[\w\d\@\.\-_]+)/(?P<size>[\d]+)/$',
         views.render_primary,
         name='avatar_render_primary'),
 ]

avatar/utils.py

@@ -1,19 +1,9 @@
 import hashlib
+import six
 
 from django.core.cache import cache
 from django.template.defaultfilters import slugify
-
-try:
-    from django.utils.encoding import force_bytes
-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.utils.encoding import force_bytes
 from django.contrib.auth import get_user_model
 
 from avatar.conf import settings

avatar/views.py

@@ -1,10 +1,7 @@
+import six
+
 from django.shortcuts import render, redirect
-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.utils.translation import gettext as _
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 

setup.py

@@ -35,6 +35,7 @@ setup(
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 4.0',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
@@ -46,6 +47,7 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     keywords='avatar, django',
     author='Eric Florenzano',