Merge branch 'master' into docs

[philo.git] / contrib / waldo / forms.py

diff --git a/contrib/waldo/forms.py b/contrib/waldo/forms.py
index 6f2b59b..2ee64d0 100644 (file)
--- a/contrib/waldo/forms.py
+++ b/contrib/waldo/forms.py
@@ -72,8 +72,8 @@ class WaldoAuthenticationForm(AuthenticationForm):
        ERROR_MESSAGE = _("Please enter a correct username and password. Note that both fields are case-sensitive.")
        
        def clean(self):
        ERROR_MESSAGE = _("Please enter a correct username and password. Note that both fields are case-sensitive.")
        
        def clean(self):

-               username = self.cleaned_data['username']
-               password = self.cleaned_data['password']
+               username = self.cleaned_data.get('username')
+               password = self.cleaned_data.get('password')

                message = self.ERROR_MESSAGE
                
                if username and password:
                message = self.ERROR_MESSAGE
                
                if username and password: