From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 24 Jan 2014 15:48:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~19
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=e50dc5c2f20e313ec89e9aa1532de388e682072f;hp=8a0b7b28c23107508789ca14b812ada1cfbe604b

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

diff --git a/portal/forms.py b/portal/forms.py
index fc8d8c3f..afbf3442 100644
--- a/portal/forms.py
+++ b/portal/forms.py
@@ -28,6 +28,10 @@ from portal.models import PendingUser, PendingSlice
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.auth import authenticate, get_user_model
+# TODO: Remove these automated forms and use html templates and views like any other page !
+# ERROR ImportError: cannot import name UNUSABLE_PASSWORD
+# XXX This is not compatible with Django 1.6.1
+# Ref: https://github.com/dot2code/varnish-bans-manager/issues/8
 from django.contrib.auth.hashers import UNUSABLE_PASSWORD, identify_hasher
 from django.contrib.sites.models import get_current_site
 from django.utils.http import int_to_base36