Fix Django 1.7 compat
In Debian, we are going to release Jessie with Django 1.7, which has just been released. Therefore, compatibility is important for us. This patch, which the Debian package already carries, fixes 2 small compatibility issues with Django 1.7. It is safe to use openstack_auth with these patches and a lower version of Django, which makes it safe to apply this patch. Change-Id: I564cde889c56e12fc0fc1347537e66b576605a0d
This commit is contained in:
parent
5c8b0c78f2
commit
6d17375a9e
|
@ -100,5 +100,6 @@ class Login(django_auth_forms.AuthenticationForm):
|
|||
LOG.warning(msg)
|
||||
self.request.session.flush()
|
||||
raise forms.ValidationError(exc)
|
||||
self.check_for_test_cookie()
|
||||
if hasattr(self, 'check_for_test_cookie'): # Dropped in django 1.7
|
||||
self.check_for_test_cookie()
|
||||
return self.cleaned_data
|
||||
|
|
|
@ -21,6 +21,10 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_auth.tests.settings'
|
|||
|
||||
from django.test import simple as test_simple
|
||||
|
||||
import django
|
||||
if hasattr(django, 'setup'):
|
||||
django.setup()
|
||||
|
||||
|
||||
def run(*test_args):
|
||||
if not test_args:
|
||||
|
|
Loading…
Reference in New Issue