Merge pull request #728 from hobson/master

Fix code.djangoproject.com/ticket/20185
This commit is contained in:
Randall Leeds 2014-04-23 16:02:10 -07:00
commit 8271f492ec

View File

@ -10,10 +10,10 @@ import re
import sys
import time
try:
from StringIO import StringIO
except:
from io import StringIO
from imp import reload
except ImportError:
from StringIO import StringIO
from django.conf import settings