diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a5999af4419f630dda23d9366b51967b8322ed3..732d0c4a644eb444d6b4385643ff32fab19fab52 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,10 +6,8 @@ exclude: | ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| - # Maybe reactivate this when all README files include prettier ignore tags? - ^README\.md$| # Library files can have extraneous formatting (even minimized) - static/(src/)?lib/| + /static/(src/)?lib/| # Repos using Sphinx to generate docs don't need prettying ^docs/_templates/.*\.html$| # You don't usually want a bot to modify your legal texts @@ -28,7 +26,7 @@ repos: language: fail files: "\\.rej$" - repo: https://github.com/oca/maintainer-tools - rev: ab1d7f6 + rev: 7d8a9f9ad73db0976fb03cbee43d953bc29b89e9 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -46,11 +44,11 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.3.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.1.2 + rev: v2.6.2 hooks: - id: prettier name: prettier (with plugin-xml) @@ -61,7 +59,7 @@ repos: - --plugin=@prettier/plugin-xml files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ - repo: https://github.com/pre-commit/mirrors-eslint - rev: v7.8.1 + rev: v8.15.0 hooks: - id: eslint verbose: true @@ -69,7 +67,7 @@ repos: - --color - --fix - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.2.0 hooks: - id: trailing-whitespace # exclude autogenerated files @@ -91,12 +89,12 @@ repos: - id: mixed-line-ending args: ["--fix=lf"] - repo: https://github.com/asottile/pyupgrade - rev: v2.7.2 + rev: v2.32.1 hooks: - id: pyupgrade args: ["--keep-percent-format"] - repo: https://github.com/PyCQA/isort - rev: 5.5.1 + rev: 5.10.1 hooks: - id: isort name: isort except __init__.py @@ -104,13 +102,13 @@ repos: - --settings=. exclude: /__init__\.py$ - repo: https://gitlab.com/PyCQA/flake8 - rev: 3.8.3 + rev: 3.9.2 hooks: - id: flake8 name: flake8 additional_dependencies: ["flake8-bugbear==20.1.4"] - repo: https://github.com/PyCQA/pylint - rev: pylint-2.5.3 + rev: v2.11.1 hooks: - id: pylint name: pylint with optional checks @@ -119,7 +117,7 @@ repos: - --exit-zero verbose: true additional_dependencies: &pylint_deps - - pylint-odoo==3.5.0 + - pylint-odoo==5.0.5 - id: pylint name: pylint with mandatory checks args: diff --git a/models/api_alfresco.py b/models/api_alfresco.py index 30cca33a113642dce60e5a76ffd336569be11b0f..4ffa9007c1e86b7e01aaa7de2cc72675e3c22733 100644 --- a/models/api_alfresco.py +++ b/models/api_alfresco.py @@ -51,6 +51,7 @@ class CgscopAlfresco(models.AbstractModel): alfresco_url + url, auth=basicAuthCredentials, verify=alfresco_ssl, + timeout=15, ) elif call_type == "post": response = requests.post( @@ -58,6 +59,7 @@ class CgscopAlfresco(models.AbstractModel): auth=basicAuthCredentials, json=json, verify=alfresco_ssl, + timeout=15, ) elif call_type == "delete": response = requests.delete( @@ -65,13 +67,14 @@ class CgscopAlfresco(models.AbstractModel): auth=basicAuthCredentials, json=json, verify=alfresco_ssl, + timeout=15, ) except Exception as err: _logger.warning( "Erreur de connexion. URL: %s", err.__str__(), ) - response = False + raise exceptions.ValidationError(err.__str__()) # Gestion erreur API if response.status_code not in [200, 201]: @@ -86,13 +89,7 @@ class CgscopAlfresco(models.AbstractModel): "- Message : %s" % (response.url, response.status_code, message) ) ) - # Si dossier déjà créé - elif ( - response.text.find("NUMADHERENT d") > 0 - or response.text.find("SIRET d") > 0 - or response.text.find("RAISONSOCIALE d") > 0 - ): - return response.json().get("dossiersExistants")[0] + return response # Get Methods