Projet

Général

Profil

0001-trivial-use-django.utils-copy-of-the-six-compatibili.patch

Frédéric Péters, 14 janvier 2019 09:23

Télécharger (2,38 ko)

Voir les différences: 

Subject: [PATCH] trivial: use django.utils copy of the six compatibility
 module (#29695)


 passerelle/apps/actesweb/models.py     | 2 +-
 passerelle/apps/atos_genesys/models.py | 2 +-
 passerelle/apps/atos_genesys/utils.py  | 2 +-
 tests/test_actesweb.py                 | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
passerelle/apps/actesweb/models.py
18 18 
import json
19 19 
import os
20 20 
import tempfile
21 
import six
22 21 
import contextlib
23 22 

  		




  24
  23
  
    
from django.core.files.storage import default_storage

  		




  25
  24
  
    
from django.template.loader import get_template

  		




  
  25
  
    
from django.utils import six

  		




  26
  26
  
    
from django.utils.dateparse import parse_date

  		




  27
  27
  
    
from django.utils.timezone import now

  		




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

  		












  

    
      passerelle/apps/atos_genesys/models.py
    
  





  17
  17
  
    
import urlparse

  		




  18
  18
  
    
import requests

  		




  19
  19
  
    
import xml.etree.ElementTree as ET

  		




  20
  
  
    
import six

  		




  21
  20
  
    
import jsonfield

  		




  22
  21
  
    

  		




  23
  22
  
    
from django.db import models

  		




  
  23
  
    
from django.utils import six

  		




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

  		




  25
  25
  
    

  		




  26
  26
  
    
from passerelle.utils import xml as xmlutils

  		












  

    
      passerelle/apps/atos_genesys/utils.py
    
  





  1
  1
  
    
import time

  		




  2
  
  
    
import six

  		




  3
  2
  
    
from contextlib import contextmanager

  		




  4
  3
  
    

  		




  5
  4
  
    
from django.db import transaction

  		




  6
  5
  
    
from django.core.cache import cache

  		




  
  6
  
    
from django.utils import six

  		




  7
  7
  
    

  		




  8
  8
  
    
from passerelle.utils.jsonresponse import APIError

  		




  9
  9
  
    

  		












  

    
      tests/test_actesweb.py
    
  





  20
  20
  
    
import io

  		




  21
  21
  
    
import os

  		




  22
  22
  
    
import shutil

  		




  23
  
  
    
import six

  		




  24
  23
  
    

  		




  25
  24
  
    
import pytest

  		




  26
  25
  
    

  		




  
  26
  
    
from django.utils import six

  		




  
  27
  
    

  		




  27
  28
  
    
import utils

  		




  28
  29
  
    
from passerelle.apps.actesweb.models import ActesWeb

  		




  29
  30
  
    

  		




  30
  
  
    
-