Projet

Général

Profil

0003-api_entreprise-uses-exception_to_text-to-display-exc.patch

Benjamin Dauvergne, 14 mai 2019 10:48

Télécharger (2,1 ko)

Voir les différences: 

Subject: [PATCH 3/5] api_entreprise: uses exception_to_text() to display
 exceptions (#33056)


 passerelle/apps/api_entreprise/models.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
passerelle/apps/api_entreprise/models.py
31 31 

  		




  32
  32
  
    
from passerelle.base.models import BaseResource

  		




  33
  33
  
    
from passerelle.utils.api import endpoint

  		




  34
  
  
    
from passerelle.utils.jsonresponse import APIError

  		




  
  34
  
    
from passerelle.utils.jsonresponse import APIError, exception_to_text

  		




  35
  35
  
    
from passerelle.views import WrongParameter

  		




  36
  36
  
    

  		




  37
  37
  
    
DOCUMENT_SIGNATURE_MAX_AGE = timedelta(days=7)

  		




  38
  38
  
    

  		




  
  39
  
    

  		




  39
  40
  
    
def normalize_dates(data):

  		




  40
  41
  
    
    timestamp_to_datetime = {}

  		




  41
  42
  
    
    for key in data:

  		




  ......




  87
  88
  
    
        except requests.RequestException as e:

  		




  88
  89
  
    
            raise APIError(u'API-entreprise connection error: %s' %

  		




  89
  90
  
    
                           response.status_code,

  		




  90
  
  
    
                           data={'error': unicode(e)})

  		




  
  91
  
    
                           data={'error': exception_to_text(e)})

  		




  91
  92
  
    
        try:

  		




  92
  93
  
    
            data = response.json()

  		




  93
  94
  
    
        except ValueError as e:

  		




  ......




  95
  96
  
    
            raise APIError(

  		




  96
  97
  
    
                u'API-entreprise returned non-JSON content with status %s: %s' %

  		




  97
  98
  
    
                (response.status_code, content),

  		




  98
  
  
    
                data={'status_code': response.status_code,

  		




  99
  
  
    
                      'exception': unicode(e),

  		




  100
  
  
    
                      'content': content,

  		




  
  99
  
    
                data={

  		




  
  100
  
    
                    'status_code': response.status_code,

  		




  
  101
  
    
                    'exception': exception_to_text(e),

  		




  
  102
  
    
                    'content': content,

  		




  101
  103
  
    
                })

  		




  102
  104
  
    
        if response.status_code != 200:

  		




  103
  105
  
    
            if data.get('error') == 'not_found':

  		




  104
  
  
    
-