From 22e016ff6c18a35a450519b94de63033f83e6b4f Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Thu, 28 Feb 2008 21:24:51 +0000 Subject: 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 --- django/test/_doctest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/test/_doctest.py') 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 -- cgit v1.3