From 65096b4cef7786d874fd52117af48c8d1cddb7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20L=C3=B3pez?= Date: Mon, 15 Feb 2016 15:03:15 -0600 Subject: [PATCH] [REF] Fix new checks of latest version of flake8 --- base_location/models/better_zip.py | 2 +- base_location_geonames_import/__openerp__.py | 4 ++-- base_location_geonames_import/wizard/geonames_import.py | 6 +++--- base_partner_sequence/models/partner.py | 2 +- firstname_display_name_trigger/res_partner.py | 5 +++-- partner_external_maps/partner_external_maps.py | 6 +++--- partner_relations/tests/test_partner_relations.py | 2 +- partner_street_number/__init__.py | 2 +- partner_street_number/__openerp__.py | 4 ++-- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/base_location/models/better_zip.py b/base_location/models/better_zip.py index 7790d9ff7..9f95f7157 100644 --- a/base_location/models/better_zip.py +++ b/base_location/models/better_zip.py @@ -44,7 +44,7 @@ class BetterZip(models.Model): 'city', 'state_id', 'country_id', - ) + ) def _get_display_name(self): if self.name: name = [self.name, self.city] diff --git a/base_location_geonames_import/__openerp__.py b/base_location_geonames_import/__openerp__.py index 8eb2c61b0..a924090ed 100644 --- a/base_location_geonames_import/__openerp__.py +++ b/base_location_geonames_import/__openerp__.py @@ -39,9 +39,9 @@ 'external_dependencies': {'python': ['requests', 'unicodecsv']}, 'data': [ 'wizard/geonames_import_view.xml', - ], + ], 'test': [ 'test/import.yml' - ], + ], 'installable': True } diff --git a/base_location_geonames_import/wizard/geonames_import.py b/base_location_geonames_import/wizard/geonames_import.py index f04881c60..7ba2dfab3 100644 --- a/base_location_geonames_import/wizard/geonames_import.py +++ b/base_location_geonames_import/wizard/geonames_import.py @@ -73,7 +73,7 @@ class BetterZipGeonamesImport(models.TransientModel): 'city': self.transform_city_name(row[2], country), 'state_id': state.id, 'country_id': country.id, - } + } return vals @api.model @@ -106,7 +106,7 @@ class BetterZipGeonamesImport(models.TransientModel): states = self.env['res.country.state'].search([ ('country_id', '=', country.id), ('code', '=', row[code_row_index]), - ]) + ]) if len(states) > 1: raise Warning( _("Too many states with code %s for country %s") @@ -118,7 +118,7 @@ class BetterZipGeonamesImport(models.TransientModel): 'name': row[name_row_index], 'code': row[code_row_index], 'country_id': country.id - }) + }) @api.one def run_import(self): diff --git a/base_partner_sequence/models/partner.py b/base_partner_sequence/models/partner.py index 8a6f84274..cb36f071d 100644 --- a/base_partner_sequence/models/partner.py +++ b/base_partner_sequence/models/partner.py @@ -27,7 +27,7 @@ class ResPartner(models.Model): # only assign a 'ref' to commercial partners if partner_id: partner = self.browse(partner_id) - vals.setdefault('is_company', partner.is_company) + vals.setdefault('is_company', partner.is_company) vals.setdefault('parent_id', partner.parent_id.id) return vals.get('is_company') or not vals.get('parent_id') diff --git a/firstname_display_name_trigger/res_partner.py b/firstname_display_name_trigger/res_partner.py index f57c07e35..bff8e5cd4 100644 --- a/firstname_display_name_trigger/res_partner.py +++ b/firstname_display_name_trigger/res_partner.py @@ -57,7 +57,7 @@ class ResPartner(orm.Model): lambda self, cr, uid, ids, context=None: self.search(cr, uid, [ ('id', 'child_of', ids) - ]), + ]), ['parent_id', 'is_company', 'name', 'firstname', 'lastname'], 10 ) @@ -65,7 +65,8 @@ class ResPartner(orm.Model): # indirection to avoid passing a copy of the overridable method when # declaring the function field - _display_name = lambda self, *a, **kw: self._display_name_compute(*a, **kw) + def _display_name(self, *a, **kw): + return self._display_name_compute(*a, **kw) _columns = { # extra field to allow ORDER BY to match visible names diff --git a/partner_external_maps/partner_external_maps.py b/partner_external_maps/partner_external_maps.py index 182e524fa..d69aa585c 100644 --- a/partner_external_maps/partner_external_maps.py +++ b/partner_external_maps/partner_external_maps.py @@ -104,7 +104,7 @@ class ResUsers(models.Model): 'context_map_website_id': map_website.id or False, 'context_route_map_website_id': map_route_website.id or False, 'context_route_start_partner_id': user.partner_id.id or False, - }) + }) class ResPartner(models.Model): @@ -167,7 +167,7 @@ class ResPartner(models.Model): 'type': 'ir.actions.act_url', 'url': url, 'target': 'new', - } + } @api.multi def open_route_map(self): @@ -207,4 +207,4 @@ class ResPartner(models.Model): 'type': 'ir.actions.act_url', 'url': url, 'target': 'new', - } + } diff --git a/partner_relations/tests/test_partner_relations.py b/partner_relations/tests/test_partner_relations.py index 6d471fc02..ddbb11cb2 100644 --- a/partner_relations/tests/test_partner_relations.py +++ b/partner_relations/tests/test_partner_relations.py @@ -30,7 +30,7 @@ class TestPartnerRelation(common.TransactionCase): self.relation_model = self.env['res.partner.relation'] self.partner_1 = self.partner_model.create({ - 'name': 'Test User 1', + 'name': 'Test User 1', 'is_company': False }) diff --git a/partner_street_number/__init__.py b/partner_street_number/__init__.py index 55fd67147..40481b593 100644 --- a/partner_street_number/__init__.py +++ b/partner_street_number/__init__.py @@ -36,7 +36,7 @@ def post_init_hook(cr, registry): cr.execute( 'SELECT id, street FROM res_partner ' 'WHERE street IS NOT NULL and street_name IS NULL' - ) + ) partner_obj = registry['res.partner'] for partner in cr.fetchall(): partner_obj.write( diff --git a/partner_street_number/__openerp__.py b/partner_street_number/__openerp__.py index cb1af3220..07f54df65 100644 --- a/partner_street_number/__openerp__.py +++ b/partner_street_number/__openerp__.py @@ -27,10 +27,10 @@ "category": 'Tools', "depends": [ 'base' - ], + ], "data": [ 'views/res_partner.xml', - ], + ], 'installable': True, 'license': 'AGPL-3', 'post_init_hook': 'post_init_hook',