From 85cdf2a990400e53b488225e9667f4bef1ef6de2 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Thu, 27 Mar 2014 11:58:31 +0100 Subject: [PATCH] [FIX] website_event: import GeoIP if GeoIP is not installed bzr revid: chm@openerp.com-20140327105831-6qwvs32aa6hj3nk2 --- addons/website_event/controllers/main.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 5b5de06dba1..a630ffa0a1c 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -26,13 +26,20 @@ from openerp.tools.translate import _ from openerp.addons.website.controllers.main import Website as controllers controllers = controllers() +import logging +_logger = logging.getLogger(__name__) from datetime import datetime, timedelta import time from dateutil.relativedelta import relativedelta from openerp import tools import werkzeug.urls -import GeoIP + +try: + import GeoIP +except ImportError: + GeoIP = None + _logger.warn("Please install GeoIP python module to use events localisation.") class website_event(http.Controller): @http.route(['/event', '/event/page/'], type='http', auth="public", website=True, multilang=True)