From ceee08cc5623745e15f8c4218b9c0043d0f35267 Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Fri, 5 Jun 2020 10:13:13 -0400
Subject: [PATCH] Remove remnants of Python 2 support code.

---
 picklefield/constants.py | 2 --
 picklefield/fields.py    | 8 +-------
 tests/models.py          | 2 --
 tests/settings.py        | 2 --
 tests/tests.py           | 8 ++------
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/picklefield/constants.py b/picklefield/constants.py
index e8232d2..fd8f71e 100644
--- a/picklefield/constants.py
+++ b/picklefield/constants.py
@@ -1,3 +1 @@
-from __future__ import unicode_literals
-
 DEFAULT_PROTOCOL = 3
diff --git a/picklefield/fields.py b/picklefield/fields.py
index 2adb043..23fe7d9 100644
--- a/picklefield/fields.py
+++ b/picklefield/fields.py
@@ -1,7 +1,6 @@
-from __future__ import unicode_literals
-
 from base64 import b64decode, b64encode
 from copy import deepcopy
+from pickle import dumps, loads
 from zlib import compress, decompress
 
 from django import VERSION as DJANGO_VERSION
@@ -11,11 +10,6 @@
 
 from .constants import DEFAULT_PROTOCOL
 
-try:
-    from cPickle import loads, dumps  # pragma: no cover
-except ImportError:
-    from pickle import loads, dumps  # pragma: no cover
-
 
 class PickledObject(str):
     """
diff --git a/tests/models.py b/tests/models.py
index 3c80b6e..eca1dbf 100644
--- a/tests/models.py
+++ b/tests/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from datetime import date
 
 from django.db import models
diff --git a/tests/settings.py b/tests/settings.py
index e2a67fa..6911ad4 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 SECRET_KEY = 'not-anymore'
 
 DATABASES = {
diff --git a/tests/tests.py b/tests/tests.py
index 1bb42f8..5fc5844 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -1,5 +1,6 @@
 import json
 from datetime import date
+from unittest.mock import patch
 
 from django.core import checks, serializers
 from django.db import IntegrityError, models
@@ -14,18 +15,13 @@
     TestCustomDataType, TestingModel,
 )
 
-try:
-    from unittest.mock import patch  # pragma: no cover
-except ImportError:
-    from mock import patch  # pragma: no cover
-
 
 class PickledObjectFieldTests(TestCase):
     def setUp(self):
         self.testing_data = (D2, S1, T1, L1,
                              TestCustomDataType(S1),
                              MinimalTestingModel)
-        return super(PickledObjectFieldTests, self).setUp()
+        return super().setUp()
 
     def test_data_integrity(self):
         """