From 81993b47eaac3cea1ebbc610a3a6b824f5195523 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Fri, 6 Sep 2019 08:07:20 +0200
Subject: [PATCH] Refs #29703 -- Removed QuerySetPaginator alias per
 deprecation timeline.

---
 django/core/paginator.py  | 11 -----------
 docs/releases/3.1.txt     |  2 ++
 tests/pagination/tests.py |  9 +--------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/django/core/paginator.py b/django/core/paginator.py
index 73dfcd679f..1f92da5d4f 100644
--- a/django/core/paginator.py
+++ b/django/core/paginator.py
@@ -3,7 +3,6 @@ import inspect
 import warnings
 from math import ceil
 
-from django.utils.deprecation import RemovedInDjango31Warning
 from django.utils.functional import cached_property
 from django.utils.inspect import method_has_no_args
 from django.utils.translation import gettext_lazy as _
@@ -126,16 +125,6 @@ class Paginator:
             )
 
 
-class QuerySetPaginator(Paginator):
-
-    def __init__(self, *args, **kwargs):
-        warnings.warn(
-            'The QuerySetPaginator alias of Paginator is deprecated.',
-            RemovedInDjango31Warning, stacklevel=2,
-        )
-        super().__init__(*args, **kwargs)
-
-
 class Page(collections.abc.Sequence):
 
     def __init__(self, object_list, number, paginator):
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index 2d2acf9745..25ea3947bc 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -232,6 +232,8 @@ to remove usage of these features.
 
 * ``django.utils.timezone.FixedOffset`` is removed.
 
+* ``django.core.paginator.QuerySetPaginator`` is removed.
+
 * ``django.contrib.postgres.fields.FloatRangeField`` and
   ``django.contrib.postgres.forms.FloatRangeField`` are removed.
 
diff --git a/tests/pagination/tests.py b/tests/pagination/tests.py
index 95310d26bd..0a807a66c3 100644
--- a/tests/pagination/tests.py
+++ b/tests/pagination/tests.py
@@ -2,11 +2,10 @@ import warnings
 from datetime import datetime
 
 from django.core.paginator import (
-    EmptyPage, InvalidPage, PageNotAnInteger, Paginator, QuerySetPaginator,
+    EmptyPage, InvalidPage, PageNotAnInteger, Paginator,
     UnorderedObjectListWarning,
 )
 from django.test import SimpleTestCase, TestCase
-from django.utils.deprecation import RemovedInDjango31Warning
 
 from .custom import ValidAdjacentNumsPaginator
 from .models import Article
@@ -298,12 +297,6 @@ class PaginationTests(SimpleTestCase):
         with self.assertRaises(EmptyPage):
             paginator.get_page(1)
 
-    def test_querysetpaginator_deprecation(self):
-        msg = 'The QuerySetPaginator alias of Paginator is deprecated.'
-        with self.assertWarnsMessage(RemovedInDjango31Warning, msg) as cm:
-            QuerySetPaginator([], 1)
-        self.assertEqual(cm.filename, __file__)
-
 
 class ModelPaginationTests(TestCase):
     """