Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored May 31, 2007
5  django/test/doctest.py → django/test/_doctest.py
... ...
@@ -1,3 +1,8 @@
  1
+# This is a slightly modified version of the doctest.py that shipped with Python 2.4
  2
+# It incorporates changes that have been submitted the the Python ticket tracker 
  3
+# as ticket #1521051. These changes allow for a DoctestRunner and Doctest base
  4
+# class to be specified when constructing a DoctestSuite.
  5
+
1 6
 # Module doctest.
2 7
 # Released to the public domain 16-Jan-2001, by Tim Peters (tim@python.org).
3 8
 # Major enhancements and refactoring by:
3  django/test/simple.py
... ...
@@ -1,5 +1,6 @@
1  
-import unittest, doctest
  1
+import unittest
2 2
 from django.conf import settings
  3
+from django.test import _doctest as doctest
3 4
 from django.test.utils import setup_test_environment, teardown_test_environment
4 5
 from django.test.utils import create_test_db, destroy_test_db
5 6
 from django.test.testcases import OutputChecker, DocTestRunner
3  django/test/testcases.py
... ...
@@ -1,8 +1,9 @@
1  
-import re, doctest, unittest
  1
+import re, unittest
2 2
 from urlparse import urlparse
3 3
 from django.db import transaction
4 4
 from django.core import management, mail
5 5
 from django.db.models import get_apps
  6
+from django.test import _doctest as doctest
6 7
 from django.test.client import Client
7 8
 
8 9
 normalize_long_ints = lambda s: re.sub(r'(?<![\w])(\d+)L(?![\w])', '\\1', s)

0 notes on commit 0e7a49f

Please sign in to comment.
Something went wrong with that request. Please try again.