Add django-2.0 compatibility

.travis.yml

@@ -22,6 +22,11 @@ python:
   - 3.6
 env:
   - DJANGO_PACKAGE="Django>=1.11,<1.12"
+  - DJANGO_PACKAGE="Django==2.0"
+matrix:
+    exclude:
+        - python: 2.7
+          env: DJANGO_PACKAGE="Django==2.0"
 install:
   - pip install --upgrade pip wheel
   - pip install -q $DJANGO_PACKAGE 

django_u2f/models.py

@@ -15,7 +15,8 @@
 
 
 class U2FKey(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='u2f_keys')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='u2f_keys',
+                             on_delete=models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
     last_used_at = models.DateTimeField(null=True)
 
@@ -47,7 +48,9 @@ def create_backup_code(self, code=None):
 
 
 class BackupCode(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='backup_codes')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL,
+                             related_name='backup_codes',
+                             on_delete=models.CASCADE)
     code = models.CharField(max_length=8)
 
     class Meta:
@@ -59,7 +62,9 @@ class Meta:
 
 
 class TOTPDevice(models.Model):
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='totp_devices')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL,
+                             related_name='totp_devices',
+                             on_delete=models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
     last_used_at = models.DateTimeField(null=True)
 

django_u2f/views.py

@@ -12,7 +12,7 @@
 from django.contrib import auth, messages
 from django.conf import settings
 from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.utils.http import is_safe_url, urlencode
 from django.shortcuts import resolve_url, get_object_or_404
 from django.contrib.sites.shortcuts import get_current_site
@@ -295,7 +295,7 @@ def key(self):
 
     def get_context_data(self, **kwargs):
         kwargs = super(AddTOTPDeviceView, self).get_context_data(**kwargs)
-        kwargs['base32_key'] = b32encode(self.key)
+        kwargs['base32_key'] = b32encode(self.key).decode()
         kwargs['qr_svg'] = self.get_qrcode(self.get_otpauth_url(self.key))
         return kwargs
 

testproj/testproj/tests.py

@@ -8,7 +8,7 @@
 import unittest
 
 from django.test import TestCase, Client
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth import get_user_model, SESSION_KEY
 from django.utils.crypto import get_random_string
 from django.utils import timezone

testproj/testproj/urls.py

@@ -8,7 +8,7 @@
 
 urlpatterns = [
     url(r'^u2f/', include(django_u2f.urls, namespace='u2f')),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
 
 if settings.DEBUG: