Merge pull request #5 from TwigWorld/py_upgrade

Py upgrade

Author: Colin Ross

.gitignore

@@ -1,2 +1,8 @@
 *.py[cod]
-.coverage
+.coverage
+
+# pycharm
+.idea/
+
+# pyenv
+.python-version

runtests.py

@@ -1,3 +1,5 @@
+import django
+
 from django.conf import settings
 from django.core.management import call_command
 
@@ -16,18 +18,30 @@
         'django.contrib.sites',
         'urlmapper'
     ),
+
     STATIC_URL='/',
     MIDDLEWARE_CLASSES=(
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.middleware.common.CommonMiddleware',
     ),
-    ROOT_URLCONF=('urlmapper.tests.urls'),
+    ROOT_URLCONF='urlmapper.tests.urls',
     SITE_ID=1,
-    TEMPLATE_CONTEXT_PROCESSORS=(
-        'django.contrib.auth.context_processors.auth',
-        'django.core.context_processors.i18n',
-        'django.core.context_processors.request',
-    ),
+
+    TEMPLATES=[
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'APP_DIRS': True,
+            'OPTIONS': {
+                'context_processors': [
+                    'django.template.context_processors.debug',
+                    'django.template.context_processors.request',
+                    'django.contrib.auth.context_processors.auth',
+                    'django.contrib.messages.context_processors.messages',
+                ],
+            },
+        },
+    ],
+
     URLMAPPER_KEYS=[
         'test_1',
         'test_2',
@@ -40,5 +54,6 @@
         'test_2': lambda request: 'test_2_success'
     },
 )
+django.setup()
 
 call_command('test')

setup.py

@@ -1,15 +1,15 @@
 from setuptools import setup, find_packages
 
-
 setup(
     name='django-url-mapper',
-    version='1.0.1',
+    version='2.0.0',
     author='Colin Barnwell',
     scripts=[],
     description='Use fixed keys in your Django template to refer to dynamic URLs',
     long_description=open('README.md').read(),
+    python_requires='>=3.7.0',
     install_requires=[
-        "Django >= 1.6",
+        "Django>=1.11.29, <2.0",
     ],
     packages=find_packages(),
     include_package_data=True

urlmapper/admin.py

@@ -1,21 +1,20 @@
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 
-from models import URLMap
+from .models import URLMap
 
-import settings
+from .settings import URLMAPPER_ALLOWED_MAPPINGS
 
 
 class URLMapAdmin(admin.ModelAdmin):
-
     list_display = ('key', 'mapping_type', 'get_url')
 
     fieldsets = [(None, {'fields': ('key',)})]
-    if 'url' in settings.URLMAPPER_ALLOWED_MAPPINGS:
+    if 'url' in URLMAPPER_ALLOWED_MAPPINGS:
         fieldsets.append((_("URL mapping"), {'fields': ('url',)}))
-    if 'object' in settings.URLMAPPER_ALLOWED_MAPPINGS:
+    if 'object' in URLMAPPER_ALLOWED_MAPPINGS:
         fieldsets.append((_("Object mapping"), {'fields': ('content_type', 'object_id')}))
-    if 'view_name' in settings.URLMAPPER_ALLOWED_MAPPINGS:
+    if 'view_name' in URLMAPPER_ALLOWED_MAPPINGS:
         fieldsets.append((_("View mapping"), {'fields': ('view_name', 'view_keywords')}))
 
 

urlmapper/helpers.py

@@ -1,5 +1,6 @@
-from models import URLMap
-from django.conf import settings
+from urlmapper import settings
+
+from .models import URLMap
 
 
 def get_mapped_url(key, request=None):
@@ -21,7 +22,7 @@ def get_mapped_url(key, request=None):
                 return settings.URLMAPPER_FUNCTIONS[key](request)
             except TypeError:
                 return settings.URLMAPPER_FUNCTIONS[key]()
-        except Exception, e:
+        except Exception as e:
             if settings.URLMAPPER_RAISE_EXCEPTION:
                 raise e
             return ''
@@ -39,8 +40,8 @@ def check_mapped_url(key):
     return bool(
         key in settings.URLMAPPER_KEYS
         and (
-            key in settings.URLMAPPER_FUNCTIONS
-            or URLMap.objects.filter(key=key).exists()
+                key in settings.URLMAPPER_FUNCTIONS
+                or URLMap.objects.filter(key=key).exists()
         )
         and get_mapped_url(key)
     )

urlmapper/models.py

@@ -1,10 +1,14 @@
-from django.contrib.contenttypes.generic import GenericForeignKey
+from __future__ import unicode_literals
+
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404
 from django.db import models
 from django.utils.translation import ugettext_lazy as _, ugettext
+# django/py3
+from django.utils.encoding import python_2_unicode_compatible
 
-import settings
+from urlmapper import settings
 
 
 def _get_key_choices():
@@ -16,7 +20,8 @@ def _get_key_choices():
     )
     if not keys:
         return [('', ugettext("There are no defined keys"))]
-    return zip(keys, keys)
+
+    return list(zip(keys, keys))
 
 
 def _get_content_type_choices():
@@ -38,6 +43,7 @@ def get_queryset(self):
         return queryset.exclude(key__in=settings.URLMAPPER_FUNCTIONS.keys())
 
 
+@python_2_unicode_compatible
 class URLMap(models.Model):
     """
     Map a key to a URL in the database. This could be a straight-up URL, an
@@ -91,7 +97,7 @@ class URLMap(models.Model):
     objects = URLMapVisibleMananger()
     _objects = models.Manager()
 
-    def __unicode__(self):
+    def __str__(self):
         return u"{key} --> {url}".format(
             key=self.key,
             url=self.get_url()
@@ -223,6 +229,7 @@ def get_url(self):
         if self.view_name:
             return self._get_view_url(raise_exception=False)
         return ''
+
     get_url.short_description = _('URL')
 
     def mapping_type(self):
@@ -232,6 +239,7 @@ def mapping_type(self):
             return _("Object")
         if self.view_name:
             return _("View")
+
     mapping_type.short_description = _("Mapping type")
 
     class Meta:

urlmapper/tests/test_helpers.py

@@ -1,3 +1,5 @@
+from importlib import reload
+
 from django.test import TestCase
 
 from ..helpers import get_mapped_url, check_mapped_url