Projet

Général

Profil

0001-cmis-upgrade-cmislib-0.6-18407.patch

Lauréline Guérin, 08 octobre 2019 08:54

Télécharger (3,99 ko)

Voir les différences: 

Subject: [PATCH] cmis: upgrade cmislib 0.6 (#18407)


 debian/control                  |  2 +-
 functests/cmis/requirements.txt |  2 +-
 passerelle/apps/cmis/models.py  | 12 +++++++-----
 setup.py                        |  2 +-
 tests/test_cmis.py              | 11 +++++++----
 5 files changed, 17 insertions(+), 12 deletions(-)
debian/control
23 23 
    python-setuptools,
24 24 
    python-django-jsonfield,
25 25 
    python-suds,
26 
    python-cmislib (>= 0.5), python-cmislib (< 0.6),
26 
    python-cmislib,
27 27 
    python-lxml,
28 28 
    python-dateutil,
29 29 
    python-pyproj,
functests/cmis/requirements.txt
1 
cmislib<0.6.0
1 
cmislib
2 2 
pytest
3 3 
requests
passerelle/apps/cmis/models.py
16 16 

  		




  17
  17
  
    
import base64

  		




  18
  18
  
    
import functools

  		




  
  19
  
    
import httplib2

  		




  19
  20
  
    
import json

  		




  20
  21
  
    
import re

  		




  21
  22
  
    
import urllib2

  		




  ......




  25
  26
  
    
    import StringIO

  		




  26
  27
  
    

  		




  27
  28
  
    
from cmislib import CmisClient

  		




  28
  
  
    
from cmislib.model import (CmisException, ObjectNotFoundException, PermissionDeniedException,

  		




  29
  
  
    
                           UpdateConflictException)

  		




  
  29
  
    
from cmislib.exceptions import CmisException

  		




  
  30
  
    
from cmislib.exceptions import ObjectNotFoundException

  		




  
  31
  
    
from cmislib.exceptions import PermissionDeniedException

  		




  
  32
  
    
from cmislib.exceptions import UpdateConflictException

  		




  30
  33
  
    
from django.db import models

  		




  31
  34
  
    
from django.utils.translation import ugettext_lazy as _

  		




  32
  35
  
    

  		




  ......




  117
  120
  
    
    def wrapper(*args, **kwargs):

  		




  118
  121
  
    
        try:

  		




  119
  122
  
    
            return f(*args, **kwargs)

  		




  120
  
  
    
        except urllib2.URLError as e:

  		




  121
  
  
    
            # FIXME when moving to cmislib >= 0.6.0

  		




  122
  
  
    
            # httplib2 will probably be used instead of urllib

  		




  
  123
  
    
        except (urllib2.URLError, httplib2.HttpLib2Error) as e:

  		




  
  124
  
    
            # FIXME urllib2 still used for cmslib 0.5 compat

  		




  123
  125
  
    
            raise APIError("connection error: %s" % e)

  		




  124
  126
  
    
        except PermissionDeniedException as e:

  		




  125
  127
  
    
            raise APIError("permission denied: %s" % e)

  		












  

    
      setup.py
    
  





  97
  97
  
    
            'pyexcel-io >= 0.4, <0.5',

  		




  98
  98
  
    
            'pyexcel-ods >= 0.4, <0.5',

  		




  99
  99
  
    
            'pyexcel-xls >= 0.4, <0.5',

  		




  100
  
  
    
            'cmislib >= 0.5, <0.6',

  		




  
  100
  
    
            'cmislib',

  		




  101
  101
  
    
            'pyproj',

  		




  102
  102
  
    
            'feedparser',

  		




  103
  103
  
    
            'lxml',

  		












  

    
      tests/test_cmis.py
    
  





  1
  1
  
    
import base64

  		




  
  2
  
    
import httplib2

  		




  2
  3
  
    
import urllib2

  		




  3
  4
  
    

  		




  4
  5
  
    
from cmislib import CmisClient

  		




  5
  
  
    
from cmislib.model import (CmisException, ObjectNotFoundException,

  		




  6
  
  
    
                           PermissionDeniedException, UpdateConflictException)

  		




  
  6
  
    
from cmislib.exceptions import CmisException

  		




  
  7
  
    
from cmislib.exceptions import ObjectNotFoundException

  		




  
  8
  
    
from cmislib.exceptions import PermissionDeniedException

  		




  
  9
  
    
from cmislib.exceptions import UpdateConflictException

  		




  7
  10
  
    
from django.contrib.contenttypes.models import ContentType

  		




  8
  11
  
    
from mock import call, Mock

  		




  9
  12
  
    
import py

  		




  ......




  263
  266
  
    

  		




  264
  267
  
    

  		




  265
  268
  
    
@pytest.mark.parametrize("cmis_exc,err_msg", [

  		




  266
  
  
    
    # FIXME when moving to cmislib >= 0.6.0

  		




  267
  
  
    
    # httplib2 will probably be used instead of urllib

  		




  
  269
  
    
    (httplib2.HttpLib2Error, "connection error"),

  		




  
  270
  
    
    # FIXME used for cmslib 0.5 compat

  		




  268
  271
  
    
    (urllib2.URLError, "connection error"),

  		




  269
  272
  
    
    (PermissionDeniedException, "permission denied"),

  		




  270
  273
  
    
    (UpdateConflictException, "update conflict"),

  		




  271
  
  
    
-