Upgrade code to Python 3.6+, Django 2.2 and remove deprecations

Author: bashu

easy_maps/admin.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django import forms
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _

easy_maps/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf import settings  # pylint: disable=W0611
 
 from appconf import AppConf

easy_maps/geocode.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.utils.encoding import smart_str
 
 from geopy import geocoders

easy_maps/migrations/0001_initial.py

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

easy_maps/models.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import logging
 import sys
 
@@ -79,7 +77,7 @@ def fetch(self):
             except Exception:
                 logger.error("Geocoding error for address '%s'", address)
 
-            self.exception = "{0.__name__}: {1}".format(sys.exc_info()[0], sys.exc_info()[1])
+            self.exception = f"{sys.exc_info()[0].__name__}: {sys.exc_info()[1]}"
 
     def has_exception(self):
         return bool(self.exception)
@@ -94,4 +92,4 @@ def save(self, *args, **kwargs):
         if (self.longitude is None) or (self.latitude is None):
             self.fetch()
 
-        super(Address, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)

easy_maps/templatetags/easy_maps_tags.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django import template
 from django.core.exceptions import ImproperlyConfigured
 
@@ -50,7 +48,7 @@ class EasyMapTag(InclusionTag):
     )
 
     def render_tag(self, context, **kwargs):
-        params = dict((k, v) for k, v in kwargs.items() if v and k not in ["template_name"])
+        params = {k: v for k, v in kwargs.items() if v and k not in ["template_name"]}
         if "address" in params and (len(params) == 2 or len(params) > 4):
             raise template.TemplateSyntaxError(
                 "easy_map tag has the following syntax: "
@@ -62,7 +60,7 @@ def render_tag(self, context, **kwargs):
                 "easy_map tag requires EASY_MAPS_GOOGLE_KEY to be set in global settings "
                 "because of the restrictions introduced in Google Maps API v3 by Google, Inc."
             )
-        return super(EasyMapTag, self).render_tag(context, **kwargs)
+        return super().render_tag(context, **kwargs)
 
     def get_template(self, context, **kwargs):
         return kwargs.get("template_name", None) or self.template

easy_maps/tests/conftest.py

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 """
     Dummy conftest.py for easi_maps.
     If you don't know what this is for, just leave it empty.
     Read more about conftest.py under:
     https://pytest.org/latest/plugins.html
 """
-from __future__ import print_function, absolute_import, division
 
 import pytest

easy_maps/tests/settings.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 import re

easy_maps/tests/test_templatetags.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-import mock
+from unittest import mock
 
 from django import template
 from django.test import TestCase

easy_maps/utils.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.core.exceptions import ImproperlyConfigured
 
 
@@ -30,7 +28,7 @@ def importpath(path, error_text=None):
             result = getattr(result, attr)
         except (AttributeError, ValueError) as e:
             if error_text is not None:
-                raise ImproperlyConfigured('Error: %s can import "%s"' % (error_text, path))
+                raise ImproperlyConfigured(f'Error: {error_text} can import "{path}"')
             else:
                 raise exception
     return result

easy_maps/widgets.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django import template
 from django.forms import TextInput
 
@@ -12,7 +10,7 @@ class AddressWithMapWidget(TextInput):
     tpl = "{{% load easy_maps_tags %}}{{% easy_map address {0.width} {0.height} {0.zoom} %}}"
 
     def render(self, name, value, attrs=None, renderer=None):
-        output = super(AddressWithMapWidget, self).render(name, value, attrs, renderer)
+        output = super().render(name, value, attrs, renderer)
 
         t = template.Template(self.tpl.format(self))
         context = template.Context(

example/urls.py

@@ -1,13 +1,13 @@
-from django.conf.urls import url
+from django.urls import path
 from django.contrib import admin
 from django.views.generic import TemplateView
 
 admin.autodiscover()
 
 urlpatterns = [
-    url(r"^admin/", admin.site.urls),
+    path('admin/', admin.site.urls),
 ]
 
 urlpatterns += [
-    url(r"^$", TemplateView.as_view(template_name="index.html")),
+    path('', TemplateView.as_view(template_name="index.html")),
 ]