From 135139e3638f53dab4643f249403870297e62412 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 30 Mar 2015 16:54:58 +0200 Subject: [PATCH] remove apparently useless import of User in portal.models that breaks app loading for django-1.7 --- portal/models.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 -- 2.43.0