Projet

Général

Profil

0001-django-1.6-fix-import-path-of-FieldDoesNotExist-exce.patch

Benjamin Dauvergne, 05 août 2014 15:23

Télécharger (2,84 ko)

Voir les différences: 

Subject: [PATCH 1/2] [django-1.6] fix import path of FieldDoesNotExist
 exception

refs #5244

 authentic2/fix_user_model.py             |    2 +-
 authentic2/registration_backend/forms.py |    2 +-
 authentic2/registration_backend/views.py |    2 +-
 authentic2/views.py                      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
authentic2/fix_user_model.py
3 3 
from django.utils.translation import ugettext_lazy as _
4 4 
from django.core.validators import MaxLengthValidator, RegexValidator
5 5 
from django.db.models.signals import class_prepared
6 
from django.db.models import FieldDoesNotExist
6 
from django.db.models.fields import FieldDoesNotExist
7 7 
from django.contrib.auth import forms
8 8 
from django.contrib.auth import get_user_model
9 9 

  		












  

    
      authentic2/registration_backend/forms.py
    
  





  2
  2
  
    
from django.utils.translation import ugettext_lazy as _

  		




  3
  3
  
    
from django.forms import Form, CharField, PasswordInput

  		




  4
  4
  
    
from django.utils.datastructures import SortedDict

  		




  5
  
  
    
from django.db.models import FieldDoesNotExist

  		




  
  5
  
    
from django.db.models.fields import FieldDoesNotExist

  		




  6
  6
  
    

  		




  7
  7
  
    

  		




  8
  8
  
    
from .. import app_settings, compat, forms, utils

  		












  

    
      authentic2/registration_backend/views.py
    
  





  9
  9
  
    
from django.contrib.sites.models import Site

  		




  10
  10
  
    
from django.contrib.auth.models import BaseUserManager, Group

  		




  11
  11
  
    
from django.conf import settings

  		




  12
  
  
    
from django.db.models import FieldDoesNotExist

  		




  
  12
  
    
from django.db.models.fields import FieldDoesNotExist

  		




  13
  13
  
    

  		




  14
  14
  
    

  		




  15
  15
  
    
from registration.views import RegistrationView as BaseRegistrationView

  		












  

    
      authentic2/views.py
    
  





  27
  27
  
    
from django.views.decorators.csrf import csrf_protect

  		




  28
  28
  
    
from django.views.decorators.cache import never_cache

  		




  29
  29
  
    
from django.contrib.auth.decorators import login_required

  		




  30
  
  
    
from django.db.models import FieldDoesNotExist

  		




  
  30
  
    
from django.db.models.fields import FieldDoesNotExist

  		




  31
  31
  
    

  		




  32
  32
  
    

  		




  33
  33
  
    
# FIXME: this decorator has nothing to do with an idp, should be moved in the

  		




  34
  
  
    
-