misc: fix wrong-import-position pylint error (#62099)

This commit is contained in:
Lauréline Guérin 2022-03-18 16:22:58 +01:00
parent 057e95d976
commit 3c4739297b
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
5 changed files with 30 additions and 32 deletions

View File

@ -20,6 +20,7 @@
import re
from collections import OrderedDict
from urllib import parse
import requests
@ -28,9 +29,6 @@ try:
except ImportError:
JSONDecodeError = ValueError
from urllib import parse
from django.contrib.postgres.fields import ArrayField
from django.core.cache import cache
from django.db import models

View File

@ -19,6 +19,7 @@ import datetime
import mimetypes
import os
import re
import sys
import tempfile
from collections import OrderedDict
@ -51,6 +52,25 @@ identifier_re = re.compile(r"^[^\d\W]\w*\Z", re.UNICODE)
code_cache = OrderedDict()
# Need for compatibility between xlrd==1.2.0 and python>3.7
if sys.version_info >= (3, 8):
try:
import xlrd.xlsx
except ImportError:
pass
else:
if hasattr(xlrd.xlsx, 'ensure_elementtree_imported'):
old_ensure_elementtree_imported = xlrd.xlsx.ensure_elementtree_imported
def ensure_elementtree_imported(*args, **kwargs):
try:
return old_ensure_elementtree_imported(*args, **kwargs)
finally:
xlrd.xlsx.Element_has_iter = True
xlrd.xlsx.ensure_elementtree_imported = ensure_elementtree_imported
def get_code(expr):
# limit size of code cache to 1024
if len(code_cache) > 1024:
@ -546,24 +566,3 @@ class TableRow(models.Model):
class Meta:
ordering = ('line_number',)
unique_together = ('resource', 'line_number')
# Need for compatibility between xlrd==1.2.0 and python>3.7
import sys
if sys.version_info >= (3, 8):
try:
import xlrd.xlsx
except ImportError:
pass
else:
if hasattr(xlrd.xlsx, 'ensure_elementtree_imported'):
old_ensure_elementtree_imported = xlrd.xlsx.ensure_elementtree_imported
def ensure_elementtree_imported(*args, **kwargs):
try:
return old_ensure_elementtree_imported(*args, **kwargs)
finally:
xlrd.xlsx.Element_has_iter = True
xlrd.xlsx.ensure_elementtree_imported = ensure_elementtree_imported

View File

@ -45,6 +45,11 @@ from urllib3.util.retry import Retry
from passerelle.base.signature import check_query, check_url
# legacy import, other modules keep importing to_json from passerelle.utils
from .jsonresponse import to_json # noqa F401 pylint: disable=unused-import
from .sftp import SFTP, SFTPField # noqa F401 pylint: disable=unused-import
from .soap import SOAPClient, SOAPTransport # noqa F401 pylint: disable=unused-import
mark_safe_lazy = lazy(mark_safe, str)
@ -445,9 +450,3 @@ def batch(iterable, size):
yield chain([next(batchiter)], batchiter)
except StopIteration:
return
# legacy import, other modules keep importing to_json from passerelle.utils
from .jsonresponse import to_json
from .sftp import SFTP, SFTPField
from .soap import SOAPClient, SOAPTransport

View File

@ -20,7 +20,6 @@ from django.utils.encoding import force_text
from django.utils.log import log_response
from requests import HTTPError, RequestException
from passerelle.utils import log_http_request
from passerelle.utils.conversion import exception_to_text
DEFAULT_DEBUG = getattr(settings, 'JSONRESPONSE_DEFAULT_DEBUG', False)
@ -123,6 +122,8 @@ class to_json:
return self.api(f, args[1], *args, **kwargs)
def api(self, f, req, *args, **kwargs):
from passerelle.utils import log_http_request
logger = self.logger or logging.getLogger('passerelle.jsonresponse')
try:
resp = f(*args, **kwargs)

View File

@ -15,12 +15,13 @@ framework.
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "passerelle.settings")
# This application object is used by any WSGI server configured to use this
# file. This includes Django's development server, if the WSGI_APPLICATION
# setting points here.
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()