Merge remote-tracking branch 'gstrat/elep' into elep

Conflicts:
	cas_provider_examples/simple/urls.py

diff --combined cas_provider/views.py
index 8ae10fa,a9beae5..0f53d38
--- 1/cas_provider/views.py
--- 2/cas_provider/views.py
+++ b/cas_provider/views.py
@@@ -1,14 -1,10 +1,14 @@@
  import logging
  logger = logging.getLogger('cas_provider.views')
 -import urllib
  
 -from urllib import urlencode
 -import urllib2
 -import urlparse
 +try:
 +    from urllib.error import HTTPError, URLError
 +    from urllib.parse import parse_qsl, urlencode, urlparse, urlsplit, urlunsplit
 +    from urllib.request import urlopen
 +except ImportError:
 +    from urllib import urlencode
 +    from urllib2 import HTTPError, URLError, urlopen
 +    from urlparse import parse_qsl, urlparse, urlsplit, urlunsplit
  from functools import wraps
  
  from django.utils.decorators import available_attrs
@@@ -22,10 -18,10 +22,11 @@@ from django.conf import setting
  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.utils.translation import ugettext as _
  
  from lxml import etree
  from cas_provider.attribute_formatters import NSMAP, CAS
@@@ -122,7 -118,7 +123,7 @@@ def login(request, template_name='cas/l
                          )
                      if service is not None:
                          args['service'] = service
 -                    args = urllib.urlencode(args)
 +                    args = urlencode(args)
  
                      url = '%s?%s' % (base_url, args)
                      logging.debug('Redirecting to %s', url)
@@@ -259,8 -255,8 +260,8 @@@ def ticket_validate(service, ticket_str
      except ServiceTicket.DoesNotExist:
          return _cas2_error_response(INVALID_TICKET)
  
 -    ticketUrl = urlparse.urlparse(ticket.service)
 -    serviceUrl = urlparse.urlparse(service)
 +    ticketUrl = urlparse(ticket.service)
 +    serviceUrl = urlparse(service)
  
      if not(ticketUrl.hostname == serviceUrl.hostname and ticketUrl.path == serviceUrl.path and ticketUrl.port == serviceUrl.port):
          return _cas2_error_response(INVALID_SERVICE)
@@@ -311,7 -307,7 +312,7 @@@ def proxy_validate(request)
  
  def generate_proxy_granting_ticket(pgt_url, ticket):
      proxy_callback_good_status = (200, 202, 301, 302, 304)
 -    uri = list(urlparse.urlsplit(pgt_url))
 +    uri = list(urlsplit(pgt_url))
  
      pgt = ProxyGrantingTicket()
      pgt.serviceTicket = ticket
@@@ -323,18 -319,18 +324,18 @@@
  
      params = {'pgtId': pgt.ticket, 'pgtIou': pgt.pgtiou}
  
 -    query = dict(urlparse.parse_qsl(uri[4]))
 +    query = dict(parse_qsl(uri[4]))
      query.update(params)
  
      uri[3] = urlencode(query)
  
      try:
 -        urllib2.urlopen(urlparse.urlunsplit(uri))
 -    except urllib2.HTTPError as e:
 +        urlopen(urlunsplit(uri))
 +    except 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))
              return
 -    except urllib2.URLError as e:
 +    except URLError as e:
          logger.debug('Checking Proxy Callback URL {} raised URLError. Not issuing PGT.'.format(uri))
          return
  
@@@ -347,7 -343,7 +348,7 @@@ def _cas2_proxy_success(pt)
  
  
  def _cas2_sucess_response(user, pgt=None, proxies=None):
 -    return HttpResponse(auth_success_response(user, pgt, proxies), mimetype='text/xml')
 +    return HttpResponse(auth_success_response(user, pgt, proxies), content_type='text/xml')
  
  
  def _cas2_error_response(code, message=None):
@@@ -358,7 -354,7 +359,7 @@@
          </cas:serviceResponse>''' % {
          'code': code,
          'message': message if message else dict(ERROR_MESSAGES).get(code)
 -    }, mimetype='text/xml')
 +    }, content_type='text/xml')
  
  
  def proxy_success(pt):
@@@ -366,7 -362,7 +367,7 @@@
      proxySuccess = etree.SubElement(response, CAS + 'proxySuccess')
      proxyTicket = etree.SubElement(proxySuccess, CAS + 'proxyTicket')
      proxyTicket.text = pt
 -    return unicode(etree.tostring(response, encoding='utf-8'), 'utf-8')
 +    return etree.tostring(response, encoding='unicode')
  
  
  def auth_success_response(user, pgt, proxies):
@@@ -401,4 -397,4 +402,4 @@@
              proxyElement = etree.SubElement(proxiesElement, CAS + "proxy")
              proxyElement.text = proxy
  
 -    return unicode(etree.tostring(response, encoding='utf-8'), 'utf-8')
 +    return etree.tostring(response, encoding='unicode')