From 7cb6936e93b3a67332ff72422273b02e8dc37691 Mon Sep 17 00:00:00 2001
From: Christofer Bertonha <christoferbertonha@gmail.com>
Date: Mon, 24 Jan 2022 13:47:23 +0100
Subject: [PATCH] feat: Add python3.10 support (ugly workaround)

---
 .github/workflows/test.yml     |  2 +-
 push_notifications/__init__.py | 11 +++++++++++
 setup.cfg                      |  1 +
 tox.ini                        |  6 ++++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3d30815a..3665fc63 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/push_notifications/__init__.py b/push_notifications/__init__.py
index 24a7be7e..5c338679 100644
--- a/push_notifications/__init__.py
+++ b/push_notifications/__init__.py
@@ -5,4 +5,15 @@
     # <Python 3.7 and lower
     import importlib_metadata
 
+try:
+    # Ugly hack for APNS sub-deps Python 3.10+
+    from collections.abc import Iterable, Mapping, MutableSet, MutableMapping
+    import collections
+    collections.Iterable = Iterable
+    collections.Mapping = Mapping
+    collections.MutableSet = MutableSet
+    collections.MutableMapping = MutableMapping
+except ImportError:
+    pass
+
 __version__ = importlib_metadata.version("django-push-notifications")
diff --git a/setup.cfg b/setup.cfg
index b68daaa1..2864abdf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ classifiers =
 	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
 	Topic :: Internet :: WWW/HTTP
 	Topic :: System :: Networking
 
diff --git a/tox.ini b/tox.ini
index 95e3eaa0..d6d92e0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,9 @@
 skipsdist = True
 usedevelop = true
 envlist =
-    py{36,37,38,39}-dj{22,32}
-    py{38,39}-dj{40,main}
+    py{36,37,38,39}-dj22
+    py{36,37,38,39,310}-dj32
+    py{38,39,310}-dj{40,main}
     flake8
 
 [gh-actions]
@@ -12,6 +13,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39, flake8
+    3.10: py310
 
 [gh-actions:env]
 DJANGO =