Added Django 3.0 support by removing python2 support (#544)

* removed invalid python 2 compatibility imports from django

* removed future imports that only mattered for python 2

* added a pre-commit configuration with default settings and pyupgrade

* removed python 2.7 and added python 3.8 to travis configuration

Author: jonathan-golorry

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.4.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v1.25.2
+    hooks:
+    -   id: pyupgrade

.travis.yml

@@ -2,9 +2,9 @@
 sudo: false
 language: python
 python:
-- 2.7
 - 3.6
 - 3.7
+- 3.8
 cache: pip
 dist: xenial
 install: travis_retry pip install tox-travis

README.rst

@@ -62,7 +62,7 @@ Edit your settings.py file:
 
 .. note::
     If you need to support multiple mobile applications from a single Django application, see `Multiple Application Support <https://github.com/jazzband/django-push-notifications/wiki/Multiple-Application-Support>`_ for details.
-	
+
 .. note::
 	If you are planning on running your project with ``APNS_USE_SANDBOX=True``, then make sure you have set the
 	*development* certificate as your ``APNS_CERTIFICATE``. Otherwise the app will not be able to connect to the correct host. See settings_ for details.
@@ -106,7 +106,7 @@ For WNS, you need both the ``WNS_PACKAGE_SECURITY_KEY`` and the ``WNS_SECRET_KEY
 **WNS settings**
 
 - ``WNS_PACKAGE_SECURITY_KEY``: TODO
-- ``WNS_SECRET_KEY``: TODO  
+- ``WNS_SECRET_KEY``: TODO
 
 **WP settings**
 

push_notifications/api/rest_framework.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from rest_framework import permissions, status
 from rest_framework.fields import IntegerField
 from rest_framework.response import Response

push_notifications/conf/app.py

@@ -1,5 +1,4 @@
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.six import string_types
 
 from ..settings import PUSH_NOTIFICATIONS_SETTINGS as SETTINGS
 from .base import BaseConfig, check_apns_certificate
@@ -177,7 +176,7 @@ def _validate_apns_certificate(self, certfile):
 				check_apns_certificate(content)
 		except Exception as e:
 			raise ImproperlyConfigured(
-				"The APNS certificate file at %r is not readable: %s" % (certfile, e)
+				"The APNS certificate file at {!r} is not readable: {}".format(certfile, e)
 			)
 
 	def _validate_fcm_config(self, application_id, application_config):
@@ -323,7 +322,7 @@ def get_max_recipients(self, cloud_type, application_id=None):
 
 	def get_apns_certificate(self, application_id=None):
 		r = self._get_application_settings(application_id, "APNS", "CERTIFICATE")
-		if not isinstance(r, string_types):
+		if not isinstance(r, str):
 			# probably the (Django) file, and file path should be got
 			if hasattr(r, "path"):
 				return r.path

push_notifications/conf/legacy.py

@@ -1,5 +1,4 @@
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.six import string_types
 
 from ..settings import PUSH_NOTIFICATIONS_SETTINGS as SETTINGS
 from .base import BaseConfig
@@ -87,7 +86,7 @@ def get_apns_certificate(self, application_id=None):
 			application_id, "APNS_CERTIFICATE",
 			"You need to setup PUSH_NOTIFICATIONS_SETTINGS properly to send messages"
 		)
-		if not isinstance(r, string_types):
+		if not isinstance(r, str):
 			# probably the (Django) file, and file path should be got
 			if hasattr(r, "path"):
 				return r.path

push_notifications/exceptions.py

@@ -1,3 +1,2 @@
-
 class NotificationError(Exception):
 	pass

push_notifications/fields.py

@@ -4,7 +4,6 @@
 from django import forms
 from django.core.validators import MaxValueValidator, MinValueValidator, RegexValidator
 from django.db import connection, models
-from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -55,7 +54,7 @@ def __init__(self, *args, **kwargs):
 
 	def prepare_value(self, value):
 		# converts bigint from db to hex before it is displayed in admin
-		if value and not isinstance(value, six.string_types) \
+		if value and not isinstance(value, str) \
 			and connection.vendor in ("mysql", "sqlite"):
 			value = _unsigned_integer_to_hex_string(value)
 		return super(forms.CharField, self).prepare_value(value)
@@ -92,7 +91,7 @@ def get_prep_value(self, value):
 		""" Return the integer value to be stored from the hex string """
 		if value is None or value == "":
 			return None
-		if isinstance(value, six.string_types):
+		if isinstance(value, str):
 			value = _hex_string_to_unsigned_integer(value)
 		if _using_signed_storage():
 			value = _unsigned_to_signed_integer(value)
@@ -108,7 +107,7 @@ def from_db_value(self, value, *args):
 
 	def to_python(self, value):
 		""" Return a str representation of the hexadecimal """
-		if isinstance(value, six.string_types):
+		if isinstance(value, str):
 			return value
 		if value is None:
 			return value

push_notifications/migrations/0001_initial.py

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

push_notifications/migrations/0002_auto_20160106_0850.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-01-06 08:50
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

push_notifications/migrations/0003_wnsdevice.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.6 on 2016-06-13 20:46
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models

push_notifications/migrations/0004_fcm.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.6 on 2016-06-13 20:46
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 

push_notifications/migrations/0005_applicationid.py

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

push_notifications/migrations/0006_webpushdevice.py

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

push_notifications/models.py

@@ -1,7 +1,4 @@
-from __future__ import unicode_literals
-
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from .fields import HexIntegerField
@@ -20,7 +17,6 @@
 )
 
 
-@python_2_unicode_compatible
 class Device(models.Model):
 	name = models.CharField(max_length=255, verbose_name=_("Name"), blank=True, null=True)
 	active = models.BooleanField(
@@ -49,7 +45,7 @@ def __str__(self):
 		return (
 			self.name or
 			str(self.device_id or "") or
-			"%s for %s" % (self.__class__.__name__, self.user or "unknown user")
+			"{} for {}".format(self.__class__.__name__, self.user or "unknown user")
 		)
 
 

push_notifications/webpush.py

@@ -11,7 +11,7 @@ class WebPushError(NotificationError):
 def get_subscription_info(application_id, uri, browser, auth, p256dh):
 	url = get_manager().get_wp_post_url(application_id, browser)
 	return {
-		"endpoint": "%s/%s" % (url, uri),
+		"endpoint": "{}/{}".format(url, uri),
 		"keys": {
 			"auth": auth,
 			"p256dh": p256dh,

tests/test_data/good_revoked.pem

@@ -1,6 +1,6 @@
 Bag Attributes
     friendlyName: Apple Development IOS Push Services: com.baseride.Magnitapp
-    localKeyID: 38 EE 6A 28 9F 92 3A 56 3F 30 A4 06 13 94 4F 76 E7 BB 58 6C 
+    localKeyID: 38 EE 6A 28 9F 92 3A 56 3F 30 A4 06 13 94 4F 76 E7 BB 58 6C
 subject=/UID=com.baseride.Magnitapp/CN=Apple Development IOS Push Services: com.baseride.Magnitapp/OU=QAMD48Y2CA/C=US
 issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
 -----BEGIN CERTIFICATE-----
@@ -37,7 +37,7 @@ hlCAJBuqEvGPrme/SYkqLv2p1WKw4IJ8IKaza6QI7MQYI1UMIabbBVbq2GxaJuEO
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: PushNotificationCloudBus
-    localKeyID: 38 EE 6A 28 9F 92 3A 56 3F 30 A4 06 13 94 4F 76 E7 BB 58 6C 
+    localKeyID: 38 EE 6A 28 9F 92 3A 56 3F 30 A4 06 13 94 4F 76 E7 BB 58 6C
 Key Attributes: <No Attributes>
 -----BEGIN RSA PRIVATE KEY-----
 MIIEogIBAAKCAQEA0W06MJky6FWGgQ2JHV3zzGwF4oHYPFOFwCEKe2nJhIZ5DKqz

tests/test_data/good_with_passwd.pem

@@ -32,7 +32,7 @@ NonhJADFD84YUTCnZC/xreAbjY7ss90fKLzxJfzMB+Wskf/EKQ==
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: CloudTrack Push
-    localKeyID: C6 2F A2 B9 4D AD EF C6 33 8B 75 04 C1 63 FC 03 4C C6 29 6D 
+    localKeyID: C6 2F A2 B9 4D AD EF C6 33 8B 75 04 C1 63 FC 03 4C C6 29 6D
 Key Attributes: <No Attributes>
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED

tests/test_gcm_push_payload.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.test import TestCase
 
 from push_notifications.gcm import send_bulk_message, send_message

tests/test_models.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 
 from django.test import TestCase