Browse Source

Removed django.utils.unittest per deprecation timeline.

Tim Graham 10 years ago
parent
commit
b952c3fc60
4 changed files with 2 additions and 29 deletions
  1. 0 13
      django/utils/unittest.py
  2. 0 14
      docs/topics/testing/overview.txt
  3. 1 1
      setup.cfg
  4. 1 1
      tests/.coveragerc

+ 0 - 13
django/utils/unittest.py

@@ -1,13 +0,0 @@
-from __future__ import absolute_import
-
-import warnings
-
-from django.utils.deprecation import RemovedInDjango19Warning
-
-warnings.warn("django.utils.unittest will be removed in Django 1.9.",
-    RemovedInDjango19Warning, stacklevel=2)
-
-try:
-    from unittest2 import *
-except ImportError:
-    from unittest import *

+ 0 - 14
docs/topics/testing/overview.txt

@@ -20,20 +20,6 @@ Writing tests
 Django's unit tests use a Python standard library module: :mod:`unittest`. This
 module defines tests using a class-based approach.
 
-.. admonition:: unittest2
-
-    .. deprecated:: 1.7
-
-    Python 2.7 introduced some major changes to the ``unittest`` library,
-    adding some extremely useful features. To ensure that every Django project
-    could benefit from these new features, Django used to ship with a copy of
-    Python 2.7's ``unittest`` backported for Python 2.6 compatibility.
-
-    Since Django no longer supports Python versions older than 2.7,
-    ``django.utils.unittest`` is deprecated. Simply use ``unittest``.
-
-.. _unittest2: https://pypi.python.org/pypi/unittest2
-
 Here is an example which subclasses from :class:`django.test.TestCase`,
 which is a subclass of :class:`unittest.TestCase` that runs each test inside a
 transaction to provide isolation::

+ 1 - 1
setup.cfg

@@ -3,7 +3,7 @@ doc_files = docs extras AUTHORS INSTALL LICENSE README.rst
 install-script = scripts/rpm-install.sh
 
 [flake8]
-exclude=build,.git,./django/utils/unittest.py,./django/utils/lru_cache.py,./django/utils/six.py,./django/conf/app_template/*,./django/dispatch/weakref_backports.py,./tests/.env,./xmlrunner,./tests/test_*.py
+exclude=build,.git,./django/utils/lru_cache.py,./django/utils/six.py,./django/conf/app_template/*,./django/dispatch/weakref_backports.py,./tests/.env,./xmlrunner,./tests/test_*.py
 ignore=E123,E128,E265,E501,W601
 max-line-length = 119
 

+ 1 - 1
tests/.coveragerc

@@ -1,5 +1,5 @@
 [run]
-omit = */django/contrib/*/tests*,*/django/utils/unittest*,*/django/core/servers/fastcgi.py,*/django/utils/autoreload.py
+omit = */django/contrib/*/tests*,*/django/core/servers/fastcgi.py,*/django/utils/autoreload.py
 
 [report]
 ignore_errors = True