Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #4426 -- Renamed duplicate doctest module _doctest, and documen…

…ted the fact that it isn't an _exact_ copy of the doctest from Python 2.4.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0e7a49fa1ee8a54fedf0bde8ac3f06e86127110a 1 parent 8d3026b
Russell Keith-Magee freakboy3742 authored
5 django/test/doctest.py → django/test/_doctest.py
View
@@ -1,3 +1,8 @@
+# This is a slightly modified version of the doctest.py that shipped with Python 2.4
+# It incorporates changes that have been submitted the the Python ticket tracker
+# as ticket #1521051. These changes allow for a DoctestRunner and Doctest base
+# class to be specified when constructing a DoctestSuite.
+
# Module doctest.
# Released to the public domain 16-Jan-2001, by Tim Peters (tim@python.org).
# Major enhancements and refactoring by:
3  django/test/simple.py
View
@@ -1,5 +1,6 @@
-import unittest, doctest
+import unittest
from django.conf import settings
+from django.test import _doctest as doctest
from django.test.utils import setup_test_environment, teardown_test_environment
from django.test.utils import create_test_db, destroy_test_db
from django.test.testcases import OutputChecker, DocTestRunner
3  django/test/testcases.py
View
@@ -1,8 +1,9 @@
-import re, doctest, unittest
+import re, unittest
from urlparse import urlparse
from django.db import transaction
from django.core import management, mail
from django.db.models import get_apps
+from django.test import _doctest as doctest
from django.test.client import Client
normalize_long_ints = lambda s: re.sub(r'(?<![\w])(\d+)L(?![\w])', '\\1', s)
Please sign in to comment.
Something went wrong with that request. Please try again.