summaryrefslogtreecommitdiff
path: root/django/test/_doctest.py
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2008-02-28 21:24:51 +0000
committerJustin Bronn <jbronn@gmail.com>2008-02-28 21:24:51 +0000
commit22e016ff6c18a35a450519b94de63033f83e6b4f (patch)
tree1e58cc40a636b4e4f3dcf429a5a116c015c36278 /django/test/_doctest.py
parent0b52413cc926446f238fd781b4def6804f64d231 (diff)
gis: Merged revisions 7105-7168 via svnmerge from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/test/_doctest.py')
-rw-r--r--django/test/_doctest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/test/_doctest.py b/django/test/_doctest.py
index d1308b855e..a56483c3ab 100644
--- a/django/test/_doctest.py
+++ b/django/test/_doctest.py
@@ -100,7 +100,7 @@ __all__ = [
import __future__
-import sys, traceback, inspect, linecache, os, re, types
+import sys, traceback, inspect, linecache, os, re
import unittest, difflib, pdb, tempfile
import warnings
from StringIO import StringIO