From 29fd40dc3ada3d3ba0eaca27ebbaf1849ff7b541 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sat, 12 Oct 2019 12:32:55 +0200 Subject: [PATCH] pre-commit, black, isort --- web_environment_ribbon/__manifest__.py | 27 ++++++++----------- .../models/web_environment_ribbon_backend.py | 22 +++++++-------- .../tests/test_environment_ribbon_data.py | 17 +++++------- 3 files changed, 28 insertions(+), 38 deletions(-) diff --git a/web_environment_ribbon/__manifest__.py b/web_environment_ribbon/__manifest__.py index 715db9ac1..9ef75cf62 100644 --- a/web_environment_ribbon/__manifest__.py +++ b/web_environment_ribbon/__manifest__.py @@ -5,21 +5,16 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': "Web Environment Ribbon", - 'version': '13.0.1.0.0', - 'category': 'Web', - 'author': 'Francesco OpenCode Apruzzese, ' - 'Tecnativa, ' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/web', - 'license': 'AGPL-3', - "depends": [ - 'web', - ], - "data": [ - 'data/ribbon_data.xml', - 'view/base_view.xml', - ], + "name": "Web Environment Ribbon", + "version": "13.0.1.0.0", + "category": "Web", + "author": "Francesco OpenCode Apruzzese, " + "Tecnativa, " + "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/web", + "license": "AGPL-3", + "depends": ["web"], + "data": ["data/ribbon_data.xml", "view/base_view.xml"], "auto_install": False, - 'installable': True + "installable": True, } diff --git a/web_environment_ribbon/models/web_environment_ribbon_backend.py b/web_environment_ribbon/models/web_environment_ribbon_backend.py index 1be0df716..5932d7b32 100644 --- a/web_environment_ribbon/models/web_environment_ribbon_backend.py +++ b/web_environment_ribbon/models/web_environment_ribbon_backend.py @@ -6,19 +6,16 @@ from odoo import api, models class WebEnvironmentRibbonBackend(models.AbstractModel): - _name = 'web.environment.ribbon.backend' - _description = 'Web Environment Ribbon Backend' + _name = "web.environment.ribbon.backend" + _description = "Web Environment Ribbon Backend" @api.model def _prepare_ribbon_format_vals(self): - return { - 'db_name': self.env.cr.dbname, - } + return {"db_name": self.env.cr.dbname} @api.model def _prepare_ribbon_name(self): - name_tmpl = self.env['ir.config_parameter'].sudo().get_param( - 'ribbon.name') + name_tmpl = self.env["ir.config_parameter"].sudo().get_param("ribbon.name") vals = self._prepare_ribbon_format_vals() return name_tmpl and name_tmpl.format(**vals) or name_tmpl @@ -28,11 +25,12 @@ class WebEnvironmentRibbonBackend(models.AbstractModel): This method returns the ribbon data from ir config parameters :return: dictionary """ - ir_config_model = self.env['ir.config_parameter'] + ir_config_model = self.env["ir.config_parameter"] name = self._prepare_ribbon_name() return { - 'name': name, - 'color': ir_config_model.sudo().get_param('ribbon.color'), - 'background_color': ir_config_model.sudo().get_param( - 'ribbon.background.color'), + "name": name, + "color": ir_config_model.sudo().get_param("ribbon.color"), + "background_color": ir_config_model.sudo().get_param( + "ribbon.background.color" + ), } diff --git a/web_environment_ribbon/tests/test_environment_ribbon_data.py b/web_environment_ribbon/tests/test_environment_ribbon_data.py index d155e9f44..f2a4378fd 100644 --- a/web_environment_ribbon/tests/test_environment_ribbon_data.py +++ b/web_environment_ribbon/tests/test_environment_ribbon_data.py @@ -8,22 +8,19 @@ class TestEnvironmentRibbonData(common.SavepointCase): @classmethod def setUpClass(cls): super(TestEnvironmentRibbonData, cls).setUpClass() - cls.env['ir.config_parameter'].set_param( - 'ribbon.name', 'Test Ribbon {db_name}') - cls.env['ir.config_parameter'].set_param('ribbon.color', '#000000') - cls.env['ir.config_parameter'].set_param( - 'ribbon.background.color', '#FFFFFF') + cls.env["ir.config_parameter"].set_param("ribbon.name", "Test Ribbon {db_name}") + cls.env["ir.config_parameter"].set_param("ribbon.color", "#000000") + cls.env["ir.config_parameter"].set_param("ribbon.background.color", "#FFFFFF") def test_environment_ribbon(self): """This test confirms that the data that is fetched by the javascript code is the right title and colors.""" - ribbon = self.env['web.environment.ribbon.backend'].\ - get_environment_ribbon() + ribbon = self.env["web.environment.ribbon.backend"].get_environment_ribbon() expected_ribbon = { - 'name': 'Test Ribbon {db_name}'.format(db_name=self.env.cr.dbname), - 'color': '#000000', - 'background_color': '#FFFFFF' + "name": "Test Ribbon {db_name}".format(db_name=self.env.cr.dbname), + "color": "#000000", + "background_color": "#FFFFFF", } self.assertDictEqual(ribbon, expected_ribbon)