浏览代码

Refs #22993 -- Removed skipIfCustomUser per deprecation timeline.

Tim Graham 8 年之前
父节点
当前提交
e90c745afd
共有 3 个文件被更改,包括 2 次插入16 次删除
  1. 0 0
      django/contrib/auth/tests/__init__.py
  2. 0 16
      django/contrib/auth/tests/utils.py
  3. 2 0
      docs/releases/2.0.txt

+ 0 - 0
django/contrib/auth/tests/__init__.py


+ 0 - 16
django/contrib/auth/tests/utils.py

@@ -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)

+ 2 - 0
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.