Compatibility up to Django 2.1, dropped < 1.8. Removed unused code, fixed tests.

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

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index 912f184..e4df105 100644 (file)
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -1,16 +1,24 @@
+from __future__ import unicode_literals
+

 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django import forms
 from django.utils.translation import ugettext_lazy as _

-from utils import create_login_ticket

 
 
 class LoginForm(forms.Form):
 
 
 class LoginForm(forms.Form):

-    username = forms.CharField(max_length=30, label=_('username'))
-    password = forms.CharField(widget=forms.PasswordInput, label=_('password'))
-    #warn = forms.BooleanField(required=False)  # TODO: Implement
-    lt = forms.CharField(widget=forms.HiddenInput, initial=create_login_ticket)
+    username = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',
+                                                          'max_length': '255'}),
+                               label=_('Username'))
+    password = forms.CharField(widget=forms.PasswordInput(), label=_('Password'))
+    service = forms.CharField(widget=forms.HiddenInput, required=False)

 
 

-    def __init__(self, service=None, renew=None, gateway=None, request=None, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
+        # renew = kwargs.pop('renew', None)
+        # gateway = kwargs.pop('gateway', None)
+        request = kwargs.pop('request', None)

         super(LoginForm, self).__init__(*args, **kwargs)
         self.request = request
         super(LoginForm, self).__init__(*args, **kwargs)
         self.request = request

-        if service is not None:
-            self.fields['service'] = forms.CharField(widget=forms.HiddenInput, initial=service)
+
+
+class MergeLoginForm(LoginForm):
+    username = forms.CharField(max_length=255, widget=forms.HiddenInput,
+                               label=_('Username'))