From 03c95bc925e3dec826ecfe15e7da9bfc544afa86 Mon Sep 17 00:00:00 2001 From: Johannes Wilm Date: Sat, 16 Jul 2022 22:26:58 +0200 Subject: [PATCH] update imports --- avatar/admin.py | 7 ++----- avatar/conf.py | 3 ++- avatar/forms.py | 7 +------ avatar/migrations/0001_initial.py | 3 --- .../0002_add_verbose_names_to_avatar_fields.py | 4 ---- avatar/migrations/0003_auto_20170827_1345.py | 4 ---- avatar/models.py | 13 ++----------- avatar/providers.py | 9 ++------- avatar/templatetags/avatar_tags.py | 14 ++++---------- avatar/utils.py | 14 ++------------ avatar/views.py | 7 ++----- 11 files changed, 17 insertions(+), 68 deletions(-) diff --git a/avatar/admin.py b/avatar/admin.py index 0025f24..c023c49 100644 --- a/avatar/admin.py +++ b/avatar/admin.py @@ -1,9 +1,6 @@ +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 gettext_lazy as _ from django.template.loader import render_to_string diff --git a/avatar/conf.py b/avatar/conf.py index bfe51ef..38dd8e2 100644 --- a/avatar/conf.py +++ b/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 diff --git a/avatar/forms.py b/avatar/forms.py index 7c0b204..850b09b 100644 --- a/avatar/forms.py +++ b/avatar/forms.py @@ -1,14 +1,9 @@ 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 gettext_lazy as _ from django.template.defaultfilters import filesizeformat diff --git a/avatar/migrations/0001_initial.py b/avatar/migrations/0001_initial.py index c2c7a3b..06c16cb 100644 --- a/avatar/migrations/0001_initial.py +++ b/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 diff --git a/avatar/migrations/0002_add_verbose_names_to_avatar_fields.py b/avatar/migrations/0002_add_verbose_names_to_avatar_fields.py index ca12b15..b0f71cb 100644 --- a/avatar/migrations/0002_add_verbose_names_to_avatar_fields.py +++ b/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 diff --git a/avatar/migrations/0003_auto_20170827_1345.py b/avatar/migrations/0003_auto_20170827_1345.py index c85e774..fa575f8 100644 --- a/avatar/migrations/0003_auto_20170827_1345.py +++ b/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 diff --git a/avatar/models.py b/avatar/models.py index cd0c8b3..1ca8a46 100644 --- a/avatar/models.py +++ b/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 @@ -12,21 +13,11 @@ from django.utils.module_loading import import_string 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)() diff --git a/avatar/providers.py b/avatar/providers.py index 7b4c5bb..b74549c 100644 --- a/avatar/providers.py +++ b/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 diff --git a/avatar/templatetags/avatar_tags.py b/avatar/templatetags/avatar_tags.py index 5ca0d35..707cd3d 100644 --- a/avatar/templatetags/avatar_tags.py +++ b/avatar/templatetags/avatar_tags.py @@ -1,15 +1,9 @@ +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 gettext as _ from django.utils.module_loading import import_string diff --git a/avatar/utils.py b/avatar/utils.py index 52baed6..2882283 100644 --- a/avatar/utils.py +++ b/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 diff --git a/avatar/views.py b/avatar/views.py index b8bf605..ec2619e 100644 --- a/avatar/views.py +++ b/avatar/views.py @@ -1,10 +1,7 @@ +import six + from django.shortcuts import render, redirect from django.utils.translation import gettext 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