Commit f1a24be0 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #6481 -- Fixed a bunch of import problems (and some whitespace cleanups). 

Found by Bastian Kleineidam with help from pyflakes. Thanks.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3eec925f

django/contrib/admin/views/decorators.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from django.contrib.auth import authenticate, login 
from django.shortcuts import render_to_response

from django.utils.translation import ugettext_lazy, ugettext as _

from django.utils.safestring import mark_safe

import base64, datetime, md5

import base64, md5

import cPickle as pickle



ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")

django/contrib/databrowse/plugins/calendars.py

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ from django.utils.translation import get_date_formats 
from django.utils.encoding import force_unicode

from django.utils.safestring import mark_safe

from django.views.generic import date_based

import datetime

import time



class CalendarPlugin(DatabrowsePlugin):

    def __init__(self, field_names=None):

django/contrib/databrowse/plugins/fieldchoices.py

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ from django.utils.text import capfirst 
from django.utils.encoding import smart_str, force_unicode

from django.utils.safestring import mark_safe

from django.views.generic import date_based

import datetime

import time

import urllib



class FieldChoicePlugin(DatabrowsePlugin):

django/contrib/databrowse/views.py

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ from django.db.models import FieldDoesNotExist, DateTimeField 
from django.http import Http404

from django.shortcuts import render_to_response

from django.contrib.databrowse.datastructures import EasyModel, EasyChoice

import datetime

import time



###########

# CHOICES #

django/contrib/formtools/preview.py

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ Formtools Preview application. 
"""



from django.conf import settings

from django.core.exceptions import ImproperlyConfigured

from django.http import Http404

from django.shortcuts import render_to_response

from django.template.context import RequestContext