Projet

Général

Profil

0002-misc-add-support-for-new-django.urls-module-36330.patch

Frédéric Péters, 22 septembre 2019 08:46

Télécharger (1,53 ko)

Voir les différences: 

Subject: [PATCH 2/3] misc: add support for new django.urls module (#36330)


 mellon/utils.py | 6 +++++-
 mellon/views.py | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
mellon/utils.py
22 22 
import isodate
23 23 
from xml.parsers import expat
24 24 

  		




  
  25
  
    
import django

  		




  25
  26
  
    
from django.contrib import auth

  		




  26
  
  
    
from django.core.urlresolvers import reverse

  		




  
  27
  
    
if django.VERSION < (1, 11, 0):

  		




  
  28
  
    
    from django.core.urlresolvers import reverse

  		




  
  29
  
    
else:

  		




  
  30
  
    
    from django.urls import reverse

  		




  27
  31
  
    
from django.template.loader import render_to_string

  		




  28
  32
  
    
from django.utils.timezone import make_aware, now, make_naive, is_aware, get_default_timezone

  		




  29
  33
  
    
from django.conf import settings

  		












  

    
      mellon/views.py
    
  





  24
  24
  
    
import xml.etree.ElementTree as ET

  		




  25
  25
  
    

  		




  26
  26
  
    

  		




  27
  
  
    
from django.core.urlresolvers import reverse

  		




  
  27
  
    
import django

  		




  
  28
  
    
if django.VERSION < (1, 11, 0):

  		




  
  29
  
    
    from django.core.urlresolvers import reverse

  		




  
  30
  
    
else:

  		




  
  31
  
    
    from django.urls import reverse

  		




  28
  32
  
    
from django.views.generic import View

  		




  29
  33
  
    
from django.http import HttpResponseBadRequest, HttpResponseRedirect, HttpResponse

  		




  30
  34
  
    
from django.contrib import auth

  		




  31
  
  
    
-