Fix standard urls. Test for Django up to 5.0.

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

diff --git a/cas_provider/models.py b/cas_provider/models.py
index 0dd8b9a..8e05337 100644 (file)
--- a/cas_provider/models.py
+++ b/cas_provider/models.py
@@ -1,16 +1,10 @@
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from random import Random
 import string
-try:
-    from urllib.parse import urlencode, urlparse, parse_qs, ParseResult
-except ImportError:
-    from urllib import urlencode
-    from urlparse import urlparse, ParseResult
-    from urlparse import parse_qs
+from urllib.parse import urlencode, urlparse, parse_qs, ParseResult
+
 
 __all__ = ['ServiceTicket', 'LoginTicket', 'ProxyGrantingTicket', 'ProxyTicket', 'ProxyGrantingTicketIOU']
 
@@ -22,9 +16,9 @@ class BaseTicket(models.Model):
         abstract = True
 
     def __init__(self, *args, **kwargs):
-        if 'ticket' not in kwargs:
-            kwargs['ticket'] = self._generate_ticket()
         super(BaseTicket, self).__init__(*args, **kwargs)
+        if not self.ticket:
+            self.ticket = self._generate_ticket()
 
     def __unicode__(self):
         return self.ticket
@@ -36,7 +30,7 @@ class BaseTicket(models.Model):
 
 class ServiceTicket(BaseTicket):
     user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'), on_delete=models.CASCADE)
-    service = models.URLField(_('service'))
+    service = models.URLField(_('service'), max_length=2048)
 
     prefix = 'ST'
 
@@ -71,9 +65,9 @@ class ProxyGrantingTicket(BaseTicket):
     prefix = 'PGT'
 
     def __init__(self, *args, **kwargs):
-        if 'pgtiou' not in kwargs:
-            kwargs['pgtiou'] = "PGTIOU-%s" % (''.join(Random().sample(string.ascii_letters + string.digits, 50)))
         super(ProxyGrantingTicket, self).__init__(*args, **kwargs)
+        if not self.pgtiou:
+            self.pgtiou = "PGTIOU-%s" % (''.join(Random().sample(string.ascii_letters + string.digits, 50)))
 
     class Meta:
         verbose_name = _('Proxy Granting Ticket')