Projet

Général

Profil

0023-misc-fix-wrong-import-position-pylint-error-62099.patch

Lauréline Guérin, 22 mars 2022 10:30

Télécharger (5,55 ko)

Voir les différences: 

Subject: [PATCH 23/65] misc: fix wrong-import-position pylint error (#62099)


 passerelle/apps/api_particulier/models.py |  4 +--
 passerelle/apps/csvdatasource/models.py   | 41 +++++++++++------------
 passerelle/utils/__init__.py              | 11 +++---
 passerelle/utils/jsonresponse.py          |  3 +-
 passerelle/wsgi.py                        |  3 +-
 5 files changed, 30 insertions(+), 32 deletions(-)
passerelle/apps/api_particulier/models.py
20 20 

  		




  21
  21
  
    
import re

  		




  22
  22
  
    
from collections import OrderedDict

  		




  
  23
  
    
from urllib import parse

  		




  23
  24
  
    

  		




  24
  25
  
    
import requests

  		




  25
  26
  
    

  		




  ......




  28
  29
  
    
except ImportError:

  		




  29
  30
  
    
    JSONDecodeError = ValueError

  		




  30
  31
  
    

  		




  31
  
  
    

  		




  32
  
  
    
from urllib import parse

  		




  33
  
  
    

  		




  34
  32
  
    
from django.contrib.postgres.fields import ArrayField

  		




  35
  33
  
    
from django.core.cache import cache

  		




  36
  34
  
    
from django.db import models

  		












  

    
      passerelle/apps/csvdatasource/models.py
    
  





  19
  19
  
    
import mimetypes

  		




  20
  20
  
    
import os

  		




  21
  21
  
    
import re

  		




  
  22
  
    
import sys

  		




  22
  23
  
    
import tempfile

  		




  23
  24
  
    
from collections import OrderedDict

  		




  24
  25
  
    

  		




  ......




  51
  52
  
    
code_cache = OrderedDict()

  		




  52
  53
  
    

  		




  53
  54
  
    

  		




  
  55
  
    
# Need for compatibility between xlrd==1.2.0 and python>3.7

  		




  
  56
  
    
if sys.version_info >= (3, 8):

  		




  
  57
  
    
    try:

  		




  
  58
  
    
        import xlrd.xlsx

  		




  
  59
  
    
    except ImportError:

  		




  
  60
  
    
        pass

  		




  
  61
  
    
    else:

  		




  
  62
  
    
        if hasattr(xlrd.xlsx, 'ensure_elementtree_imported'):

  		




  
  63
  
    
            old_ensure_elementtree_imported = xlrd.xlsx.ensure_elementtree_imported

  		




  
  64
  
    

  		




  
  65
  
    
            def ensure_elementtree_imported(*args, **kwargs):

  		




  
  66
  
    
                try:

  		




  
  67
  
    
                    return old_ensure_elementtree_imported(*args, **kwargs)

  		




  
  68
  
    
                finally:

  		




  
  69
  
    
                    xlrd.xlsx.Element_has_iter = True

  		




  
  70
  
    

  		




  
  71
  
    
            xlrd.xlsx.ensure_elementtree_imported = ensure_elementtree_imported

  		




  
  72
  
    

  		




  
  73
  
    

  		




  54
  74
  
    
def get_code(expr):

  		




  55
  75
  
    
    # limit size of code cache to 1024

  		




  56
  76
  
    
    if len(code_cache) > 1024:

  		




  ......




  546
  566
  
    
    class Meta:

  		




  547
  567
  
    
        ordering = ('line_number',)

  		




  548
  568
  
    
        unique_together = ('resource', 'line_number')

  		




  549
  
  
    

  		




  550
  
  
    

  		




  551
  
  
    
# Need for compatibility between xlrd==1.2.0 and python>3.7

  		




  552
  
  
    
import sys

  		




  553
  
  
    

  		




  554
  
  
    
if sys.version_info >= (3, 8):

  		




  555
  
  
    
    try:

  		




  556
  
  
    
        import xlrd.xlsx

  		




  557
  
  
    
    except ImportError:

  		




  558
  
  
    
        pass

  		




  559
  
  
    
    else:

  		




  560
  
  
    
        if hasattr(xlrd.xlsx, 'ensure_elementtree_imported'):

  		




  561
  
  
    
            old_ensure_elementtree_imported = xlrd.xlsx.ensure_elementtree_imported

  		




  562
  
  
    

  		




  563
  
  
    
            def ensure_elementtree_imported(*args, **kwargs):

  		




  564
  
  
    
                try:

  		




  565
  
  
    
                    return old_ensure_elementtree_imported(*args, **kwargs)

  		




  566
  
  
    
                finally:

  		




  567
  
  
    
                    xlrd.xlsx.Element_has_iter = True

  		




  568
  
  
    

  		




  569
  
  
    
            xlrd.xlsx.ensure_elementtree_imported = ensure_elementtree_imported

  		












  

    
      passerelle/utils/__init__.py
    
  





  45
  45
  
    

  		




  46
  46
  
    
from passerelle.base.signature import check_query, check_url

  		




  47
  47
  
    

  		




  
  48
  
    
# legacy import, other modules keep importing to_json from passerelle.utils

  		




  
  49
  
    
from .jsonresponse import to_json  # noqa F401 pylint: disable=unused-import

  		




  
  50
  
    
from .sftp import SFTP, SFTPField  # noqa F401 pylint: disable=unused-import

  		




  
  51
  
    
from .soap import SOAPClient, SOAPTransport  # noqa F401 pylint: disable=unused-import

  		




  
  52
  
    

  		




  48
  53
  
    
mark_safe_lazy = lazy(mark_safe, str)

  		




  49
  54
  
    

  		




  50
  55
  
    

  		




  ......




  445
  450
  
    
            yield chain([next(batchiter)], batchiter)

  		




  446
  451
  
    
        except StopIteration:

  		




  447
  452
  
    
            return

  		




  448
  
  
    

  		




  449
  
  
    

  		




  450
  
  
    
# legacy import, other modules keep importing to_json from passerelle.utils

  		




  451
  
  
    
from .jsonresponse import to_json

  		




  452
  
  
    
from .sftp import SFTP, SFTPField

  		




  453
  
  
    
from .soap import SOAPClient, SOAPTransport

  		












  

    
      passerelle/utils/jsonresponse.py
    
  





  20
  20
  
    
from django.utils.log import log_response

  		




  21
  21
  
    
from requests import HTTPError, RequestException

  		




  22
  22
  
    

  		




  23
  
  
    
from passerelle.utils import log_http_request

  		




  24
  23
  
    
from passerelle.utils.conversion import exception_to_text

  		




  25
  24
  
    

  		




  26
  25
  
    
DEFAULT_DEBUG = getattr(settings, 'JSONRESPONSE_DEFAULT_DEBUG', False)

  		




  ......




  123
  122
  
    
        return self.api(f, args[1], *args, **kwargs)

  		




  124
  123
  
    

  		




  125
  124
  
    
    def api(self, f, req, *args, **kwargs):

  		




  
  125
  
    
        from passerelle.utils import log_http_request

  		




  
  126
  
    

  		




  126
  127
  
    
        logger = self.logger or logging.getLogger('passerelle.jsonresponse')

  		




  127
  128
  
    
        try:

  		




  128
  129
  
    
            resp = f(*args, **kwargs)

  		












  

    
      passerelle/wsgi.py
    
  





  15
  15
  
    
"""

  		




  16
  16
  
    
import os

  		




  17
  17
  
    

  		




  
  18
  
    
from django.core.wsgi import get_wsgi_application

  		




  
  19
  
    

  		




  18
  20
  
    
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "passerelle.settings")

  		




  19
  21
  
    

  		




  20
  22
  
    
# This application object is used by any WSGI server configured to use this

  		




  21
  23
  
    
# file. This includes Django's development server, if the WSGI_APPLICATION

  		




  22
  24
  
    
# setting points here.

  		




  23
  
  
    
from django.core.wsgi import get_wsgi_application

  		




  24
  25
  
    

  		




  25
  26
  
    
application = get_wsgi_application()

  		




  26
  27
  
    

  		




  27
  
  
    
-