diff --git a/ietf/ietfauth/auth.py b/ietf/ietfauth/auth.py index a3cb36962..029a0b557 100644 --- a/ietf/ietfauth/auth.py +++ b/ietf/ietfauth/auth.py @@ -34,7 +34,7 @@ from django.contrib.auth.backends import RemoteUserBackend from django.contrib.auth.models import Group -from ietf.idtracker.models import IESGLogin, Role, PersonOrOrgInfo +from ietf.idtracker.models import IESGLogin, Role from ietf.ietfauth.models import IetfUserProfile from ietf.utils import log diff --git a/ietf/ietfauth/forms.py b/ietf/ietfauth/forms.py index 1db606234..219df1dc6 100644 --- a/ietf/ietfauth/forms.py +++ b/ietf/ietfauth/forms.py @@ -5,12 +5,10 @@ import subprocess from django import forms from django.conf import settings from django.contrib.auth.models import User -from django.contrib.auth.forms import PasswordResetForm from django.contrib.sites.models import Site -from django.utils.translation import ugettext, ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ from ietf.utils.mail import send_mail -from ietf.utils import debug from ietf.person.models import Person, Email diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py index b45c520cd..ad8dd23fb 100644 --- a/ietf/ietfauth/views.py +++ b/ietf/ietfauth/views.py @@ -38,24 +38,14 @@ import hashlib from django.conf import settings from django.template import RequestContext from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.shortcuts import get_object_or_404, render_to_response +from django.shortcuts import render_to_response from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User -from django.http import HttpResponseRedirect, HttpResponse, Http404 -from django.shortcuts import render_to_response -from django.template import RequestContext -from django.utils import simplejson from django.utils.http import urlquote -from django.contrib.auth.models import User from django.utils import simplejson as json from django.utils.translation import ugettext as _ -#from forms import * -from ietf.ietfauth.forms import (RegistrationForm, PasswordForm, - RecoverPasswordForm) - - def index(request): return render_to_response('registration/index.html', context_instance=RequestContext(request)) @@ -68,7 +58,6 @@ def url_login(request, user, passwd): return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to))) return HttpResponse("Not authenticated?", status=500) - def ietf_login(request): if not request.user.is_authenticated(): # This probably means an exception occured inside IetfUserBackend @@ -77,7 +66,6 @@ def ietf_login(request): request.session.set_test_cookie() return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to))) - def ietf_loggedin(request): if not request.session.test_cookie_worked(): return HttpResponse("You need to enable cookies") @@ -87,7 +75,6 @@ def ietf_loggedin(request): redirect_to = settings.LOGIN_REDIRECT_URL return HttpResponseRedirect(redirect_to) - @login_required def profile(request): if settings.USE_DB_REDESIGN_PROXY_CLASSES: