From dd9c3ecc2b870470228b8a65642730cf86b36734 Mon Sep 17 00:00:00 2001 From: Lindsay Date: Tue, 2 Jun 2020 14:42:47 +0200 Subject: [PATCH] fixing pylint travis --- base_geoengine_demo/models/geo_npa.py | 4 ++-- base_geoengine_demo/models/retail_machine.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/base_geoengine_demo/models/geo_npa.py b/base_geoengine_demo/models/geo_npa.py index 80b8831e5f..101fe7a5a8 100644 --- a/base_geoengine_demo/models/geo_npa.py +++ b/base_geoengine_demo/models/geo_npa.py @@ -18,12 +18,12 @@ class NPA(geo_model.GeoModel): city = fields.Char('City', size=64, index=True, required=True) the_geom = geo_fields.GeoMultiPolygon('NPA Shape') total_sales = fields.Float( - compute='_get_ZIP_total_sales', + compute='_compute_ZIP_total_sales', string='Spatial! Total Sales', ) @api.multi - def _get_ZIP_total_sales(self): + def _compute_ZIP_total_sales(self): """Return the total of the invoiced sales for this npa""" mach_obj = self.env['geoengine.demo.automatic.retailing.machine'] for rec in self: diff --git a/base_geoengine_demo/models/retail_machine.py b/base_geoengine_demo/models/retail_machine.py index 0fb57e19df..504e77dd00 100644 --- a/base_geoengine_demo/models/retail_machine.py +++ b/base_geoengine_demo/models/retail_machine.py @@ -1,12 +1,18 @@ # -*- coding: utf-8 -*- # Copyright 2011-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -import geojson + +import logging from odoo import api, fields from odoo.addons.base_geoengine import geo_model from odoo.addons.base_geoengine import fields as geo_fields +_logger = logging.getLogger(__name__) +try: + import geojson- +except (ImportError, IOError) as err: + _logger.debug(err) class RetailMachine(geo_model.GeoModel): """GEO OSV SAMPLE"""