summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-12-30 18:10:04 -0500
committerTim Graham <timograham@gmail.com>2017-01-17 14:09:29 -0500
commite90c745afdcf89bc3416c9cb2d4a06dfacb2a250 (patch)
tree8fa5ffb0de3854831faee7614938e56a6830988b
parente707e4c709c2e3f2dad69643eb838f87491891f8 (diff)
Refs #22993 -- Removed skipIfCustomUser per deprecation timeline.
-rw-r--r--django/contrib/auth/tests/__init__.py0
-rw-r--r--django/contrib/auth/tests/utils.py16
-rw-r--r--docs/releases/2.0.txt2
3 files changed, 2 insertions, 16 deletions
diff --git a/django/contrib/auth/tests/__init__.py b/django/contrib/auth/tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/django/contrib/auth/tests/__init__.py
+++ /dev/null
diff --git a/django/contrib/auth/tests/utils.py b/django/contrib/auth/tests/utils.py
deleted file mode 100644
index 035b3a5f42..0000000000
--- a/django/contrib/auth/tests/utils.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import warnings
-from unittest import skipIf
-
-from django.conf import settings
-from django.utils.deprecation import RemovedInDjango20Warning
-
-
-def skipIfCustomUser(test_func):
- """
- Skip a test if a custom user model is in use.
- """
- warnings.warn(
- "django.contrib.auth.tests.utils.skipIfCustomUser is deprecated.",
- RemovedInDjango20Warning, stacklevel=2)
-
- return skipIf(settings.AUTH_USER_MODEL != 'auth.User', 'Custom user model in use')(test_func)
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index 0982218b92..c87faba783 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -259,3 +259,5 @@ these features.
zones no longer convert aware datetimes to naive values in UTC anymore when
such values are passed as parameters to SQL queries executed outside of the
ORM, e.g. with ``cursor.execute()``.
+
+* ``django.contrib.auth.tests.utils.skipIfCustomUser()`` is removed.