[IMP] account_statement_import_camt: pre-commit auto fixes

OCA · May 23, 2024 · 02c43b7 · 02c43b7
1 parent d56042c
commit 02c43b7
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 55 deletions.
diff --git a/account_statement_import_camt/README.rst b/account_statement_import_camt/README.rst
@@ -17,13 +17,13 @@ CAMT Format Bank Statements Import
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--statement--import-lightgray.png?logo=github
-    :target: https://github.com/OCA/bank-statement-import/tree/16.0/account_statement_import_camt
+    :target: https://github.com/OCA/bank-statement-import/tree/17.0/account_statement_import_camt
     :alt: OCA/bank-statement-import
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/bank-statement-import-16-0/bank-statement-import-16-0-account_statement_import_camt
+    :target: https://translation.odoo-community.org/projects/bank-statement-import-17-0/bank-statement-import-17-0-account_statement_import_camt
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-statement-import&target_branch=16.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-statement-import&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -41,38 +41,45 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/bank-statement-import/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/bank-statement-import/issues/new?body=module:%20account_statement_import_camt%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/bank-statement-import/issues/new?body=module:%20account_statement_import_camt%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
 Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Therp BV
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* Holger Brunn <[email protected]>
-* Stefan Rijnhart <[email protected]>
-* Ronald Portier <[email protected]>
-* Andrea Stirpe <[email protected]>
-* Maxence Groine <[email protected]>
-* Iryna Vyshnevska <[email protected]>
-* `Trobz <https://trobz.com>`_:
+-  Holger Brunn <[email protected]>
 
-    * Son Ho <[email protected]>
+-  Stefan Rijnhart <[email protected]>
+
+-  Ronald Portier <[email protected]>
+
+-  Andrea Stirpe <[email protected]>
+
+-  Maxence Groine <[email protected]>
+
+-  Iryna Vyshnevska <[email protected]>
+
+-  `Trobz <https://trobz.com>`__:
+
+      -  Son Ho <[email protected]>
 
 Other credits
-~~~~~~~~~~~~~
+-------------
 
-The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp
+The migration of this module from 15.0 to 16.0 was financially supported
+by Camptocamp
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -84,6 +91,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/bank-statement-import <https://github.com/OCA/bank-statement-import/tree/16.0/account_statement_import_camt>`_ project on GitHub.
+This module is part of the `OCA/bank-statement-import <https://github.com/OCA/bank-statement-import/tree/17.0/account_statement_import_camt>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_statement_import_camt/models/account_bank_statement_line.py b/account_statement_import_camt/models/account_bank_statement_line.py
@@ -4,7 +4,6 @@
 
 
 class AccountBankStatementLine(models.Model):
-
     _inherit = "account.bank.statement.line"
 
     def write(self, vals):

diff --git a/account_statement_import_camt/models/account_journal.py b/account_statement_import_camt/models/account_journal.py
@@ -8,8 +8,6 @@ class AccountJournal(models.Model):
     _inherit = "account.journal"
 
     def _get_bank_statements_available_import_formats(self):
-        res = super(
-            AccountJournal, self
-        )._get_bank_statements_available_import_formats()
+        res = super()._get_bank_statements_available_import_formats()
         res.extend([_("camt.053.001.02"), _("camt.054.001.02")])
         return res
diff --git a/account_statement_import_camt/models/bank_statement.py b/account_statement_import_camt/models/bank_statement.py
@@ -4,7 +4,6 @@
 
 
 class AccountBankStatement(models.Model):
-
     _inherit = "account.bank.statement"
 
     def reconciliation_widget_preprocess(self):

diff --git a/account_statement_import_camt/models/parser.py b/account_statement_import_camt/models/parser.py
@@ -39,7 +39,7 @@ def add_value_from_node(self, ns, node, xpath_str, obj, attr_name, join_str=None
         If xpath_str is a list (or iterable), it will be seen as a series
         of search path's in order of preference. The first item that results
         in a found node will be used to set a value."""
-        if not isinstance(xpath_str, (list, tuple)):
+        if not isinstance(xpath_str, list | tuple):
             xpath_str = [xpath_str]
         for search_str in xpath_str:
             found_node = node.xpath(search_str, namespaces={"ns": ns})
@@ -246,20 +246,23 @@ def parse_transaction_details(self, ns, node, transaction):
     def generate_narration(self, transaction):
         # this block ensure compatibility with v13
         transaction["narration"] = {
-            "%s (RltdPties/Nm)"
-            % _("Partner Name"): transaction.get("partner_name", ""),
-            "%s (RltdPties/Acct)"
-            % _("Partner Account Number"): transaction.get("account_number", ""),
-            "%s (BookgDt)" % _("Transaction Date"): transaction.get("date", ""),
+            "{} (RltdPties/Nm)".format(_("Partner Name")): transaction.get(
+                "partner_name", ""
+            ),
+            "{} (RltdPties/Acct)".format(_("Partner Account Number")): transaction.get(
+                "account_number", ""
+            ),
+            "{} (BookgDt)".format(_("Transaction Date")): transaction.get("date", ""),
             _("Reference"): transaction.get("ref", ""),
             _("Communication"): transaction.get("name", ""),
-            "%s (BkTxCd)"
-            % _("Transaction Type"): transaction.get("transaction_type", ""),
+            "{} (BkTxCd)".format(_("Transaction Type")): transaction.get(
+                "transaction_type", ""
+            ),
             **transaction["narration"],
         }
 
         transaction["narration"] = "\n".join(
-            ["%s: %s" % (key, val) for key, val in transaction["narration"].items()]
+            [f"{key}: {val}" for key, val in transaction["narration"].items()]
         )
 
     def parse_entry(self, ns, node):

diff --git a/account_statement_import_camt/pyproject.toml b/account_statement_import_camt/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/account_statement_import_camt/readme/CONTRIBUTORS.md b/account_statement_import_camt/readme/CONTRIBUTORS.md
@@ -0,0 +1,15 @@
+- Holger Brunn \<<[email protected]>\>
+
+- Stefan Rijnhart \<<[email protected]>\>
+
+- Ronald Portier \<<[email protected]>\>
+
+- Andrea Stirpe \<<[email protected]>\>
+
+- Maxence Groine \<<[email protected]>\>
+
+- Iryna Vyshnevska \<<[email protected]>\>
+
+- [Trobz](https://trobz.com):
+
+  > - Son Ho \<<[email protected]>\>
diff --git a/account_statement_import_camt/readme/CONTRIBUTORS.rst b/account_statement_import_camt/readme/CONTRIBUTORS.rst
diff --git a/..._statement_import_camt/readme/CREDITS.rst → ...t_statement_import_camt/readme/CREDITS.md b/..._statement_import_camt/readme/CREDITS.rst → ...t_statement_import_camt/readme/CREDITS.md
@@ -1 +1,2 @@
-The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp
+The migration of this module from 15.0 to 16.0 was financially supported
+by Camptocamp
diff --git a/...tement_import_camt/readme/DESCRIPTION.rst → ...atement_import_camt/readme/DESCRIPTION.md b/...tement_import_camt/readme/DESCRIPTION.rst → ...atement_import_camt/readme/DESCRIPTION.md
diff --git a/account_statement_import_camt/static/description/index.html b/account_statement_import_camt/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -8,10 +9,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +276,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +302,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -368,7 +370,7 @@ <h1 class="title">CAMT Format Bank Statements Import</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:6af9753752cdfa39f3d971e084ed946578dc75aafbbc9a600aeb0b8b06b4427b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/bank-statement-import/tree/16.0/account_statement_import_camt"><img alt="OCA/bank-statement-import" src="https://img.shields.io/badge/github-OCA%2Fbank--statement--import-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/bank-statement-import-16-0/bank-statement-import-16-0-account_statement_import_camt"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/bank-statement-import&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/bank-statement-import/tree/17.0/account_statement_import_camt"><img alt="OCA/bank-statement-import" src="https://img.shields.io/badge/github-OCA%2Fbank--statement--import-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/bank-statement-import-17-0/bank-statement-import-17-0-account_statement_import_camt"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/bank-statement-import&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Module to import SEPA CAMT.053 and CAMT.054 Format bank statement files.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -388,7 +390,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/bank-statement-import/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/bank-statement-import/issues/new?body=module:%20account_statement_import_camt%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/bank-statement-import/issues/new?body=module:%20account_statement_import_camt%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -425,16 +427,19 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 </div>
 <div class="section" id="other-credits">
 <h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
-<p>The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp</p>
+<p>The migration of this module from 15.0 to 16.0 was financially supported
+by Camptocamp</p>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/bank-statement-import/tree/16.0/account_statement_import_camt">OCA/bank-statement-import</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/bank-statement-import/tree/17.0/account_statement_import_camt">OCA/bank-statement-import</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/account_statement_import_camt/tests/test_import_bank_statement.py b/account_statement_import_camt/tests/test_import_bank_statement.py
@@ -53,7 +53,7 @@ def _get_files_diffs(self, inputfile_path, goldenfile_path) -> list:
         with open(get_module_resource(*inputfile_path.parts), "rb") as inputf:
             res = self.parser.parse(inputf.read())
         # Read the output file, store the expected imported values
-        with open(get_module_resource(*goldenfile_path.parts), "r") as goldf:
+        with open(get_module_resource(*goldenfile_path.parts)) as goldf:
             gold_name, gold_lines = goldf.name, goldf.readlines()
         # Save the imported values in a tmp file to compare them w/ the expected values
         with tempfile.NamedTemporaryFile(mode="w+", suffix=".pydata") as tempf:

diff --git a/account_statement_import_file/static/description/index.html b/account_statement_import_file/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -448,7 +449,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>