From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 30 Mar 2015 14:54:58 +0000 (+0200)
Subject: remove apparently useless import of User in portal.models that breaks app loading... 
X-Git-Tag: myslice-1.3~45^2~5^2~1
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=135139e3638f53dab4643f249403870297e62412

remove apparently useless import of User in portal.models that breaks app loading for django-1.7
---

diff --git a/portal/models.py b/portal/models.py
index f578d934..9ffff60f 100644
--- a/portal/models.py
+++ b/portal/models.py
@@ -33,11 +33,11 @@ from django.template.loader   import render_to_string
 
 #from django.core.validators import validate_email
 
-try:
-    from django.contrib.auth import get_user_model
-    User = get_user_model()
-except ImportError:
-    from django.contrib.auth.models import User
+#try:
+#    from django.contrib.auth import get_user_model
+#    User = get_user_model()
+#except ImportError:
+#    from django.contrib.auth.models import User
 
 try:
     from django.utils.timezone import now as datetime_now