django 1.6 comp fix

[django-cas-provider.git] / cas_provider / views.py

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 7aeaafb..6cc322a 100644 (file)
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -2,7 +2,6 @@ import logging
 logger = logging.getLogger('cas_provider.views')
 import urllib
 
 logger = logging.getLogger('cas_provider.views')
 import urllib
 

-import logging

 from urllib import urlencode
 import urllib2
 import urlparse
 from urllib import urlencode
 import urllib2
 import urlparse


@@ -19,6 +18,7 @@ from django.conf import settings
 from django.contrib.auth import login as auth_login, logout as auth_logout
 from django.core.urlresolvers import get_callable
 from django.shortcuts import render_to_response
 from django.contrib.auth import login as auth_login, logout as auth_logout
 from django.core.urlresolvers import get_callable
 from django.shortcuts import render_to_response

+from django.utils.translation import ugettext as _

 from django.template import RequestContext
 from django.contrib.auth import authenticate
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
 from django.contrib.auth import authenticate
 from django.core.urlresolvers import reverse


@@ -28,7 +28,6 @@ from cas_provider.attribute_formatters import NSMAP, CAS
 from cas_provider.models import ProxyGrantingTicket, ProxyTicket
 from cas_provider.models import ServiceTicket
 
 from cas_provider.models import ProxyGrantingTicket, ProxyTicket
 from cas_provider.models import ServiceTicket
 

-from cas_provider.exceptions import SameEmailMismatchedPasswords

 from cas_provider.forms import LoginForm, MergeLoginForm
 
 from . import signals
 from cas_provider.forms import LoginForm, MergeLoginForm
 
 from . import signals


@@ -98,7 +97,7 @@ def login(request, template_name='cas/login.html',
         if form.is_valid():
             service = form.cleaned_data.get('service', None)
             try:
         if form.is_valid():
             service = form.cleaned_data.get('service', None)
             try:

-                auth_args = dict(username=form.cleaned_data['email'],
+                auth_args = dict(username=form.cleaned_data['username'],

                                  password=form.cleaned_data['password'])
                 if merge:
                     # We only want to send the merge argument if it's
                                  password=form.cleaned_data['password'])
                 if merge:
                     # We only want to send the merge argument if it's


@@ -106,7 +105,7 @@ def login(request, template_name='cas/login.html',
                     # through the auth backends properly.
                     auth_args['merge'] = merge
                 user = authenticate(**auth_args)
                     # through the auth backends properly.
                     auth_args['merge'] = merge
                 user = authenticate(**auth_args)

-            except SameEmailMismatchedPasswords:
+            except:

                 # Need to merge the accounts?
                 if merge:
                     # We shouldn't get here...
                 # Need to merge the accounts?
                 if merge:
                     # We shouldn't get here...


@@ -115,7 +114,7 @@ def login(request, template_name='cas/login.html',
                     base_url = reverse('cas_provider_merge')
                     args = dict(
                         success_redirect=success_redirect,
                     base_url = reverse('cas_provider_merge')
                     args = dict(
                         success_redirect=success_redirect,

-                        email=form.cleaned_data['email'],
+                        username=form.cleaned_data['username'],

                         )
                     if service is not None:
                         args['service'] = service
                         )
                     if service is not None:
                         args['service'] = service


@@ -126,21 +125,21 @@ def login(request, template_name='cas/login.html',
                     return HttpResponseRedirect(url)
 
             if user is None:
                     return HttpResponseRedirect(url)
 
             if user is None:

-                errors.append('Incorrect username and/or password.')
+                errors.append(_('Incorrect username and/or password.'))

             else:
                 if user.is_active:
                     auth_login(request, user)
 
     else:  # Not a POST...
         if merge:
             else:
                 if user.is_active:
                     auth_login(request, user)
 
     else:  # Not a POST...
         if merge:

-            form = MergeLoginForm(initial={'service': service, 'email': request.GET.get('email')})
+            form = MergeLoginForm(initial={'service': service, 'username': request.GET.get('username')})

         else:
             form = LoginForm(initial={'service': service})
 
     if user is not None and user.is_authenticated():
         # We have an authenticated user.
         if not user.is_active:
         else:
             form = LoginForm(initial={'service': service})
 
     if user is not None and user.is_authenticated():
         # We have an authenticated user.
         if not user.is_active:

-            errors.append('This account is disabled.')
+            errors.append(_('This account is disabled. Please contact us if you feel it should be enabled again.'))

         else:
             # Send the on_cas_login signal. If we get an HttpResponse, return that.
             for receiver, response in signals.on_cas_login.send(sender=login, request=request, **kwargs):
         else:
             # Send the on_cas_login signal. If we get an HttpResponse, return that.
             for receiver, response in signals.on_cas_login.send(sender=login, request=request, **kwargs):


@@ -326,7 +325,7 @@ def generate_proxy_granting_ticket(pgt_url, ticket):
     uri[3] = urlencode(query)
 
     try:
     uri[3] = urlencode(query)
 
     try:

-        response = urllib2.urlopen(urlparse.urlunsplit(uri))
+        urllib2.urlopen(urlparse.urlunsplit(uri))

     except urllib2.HTTPError as e:
         if not e.code in proxy_callback_good_status:
             logger.debug('Checking Proxy Callback URL {} returned {}. Not issuing PGT.'.format(uri, e.code))
     except urllib2.HTTPError as e:
         if not e.code in proxy_callback_good_status:
             logger.debug('Checking Proxy Callback URL {} returned {}. Not issuing PGT.'.format(uri, e.code))