diff --git a/modules/geolocip/__init__.py b/modules/geolocip/__init__.py deleted file mode 100644 index c3ae46d455661a4f184ffbda36bc9b886ab5f670..0000000000000000000000000000000000000000 --- a/modules/geolocip/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .module import GeolocIpModule - -__all__ = ['GeolocIpModule'] diff --git a/modules/geolocip/favicon.png b/modules/geolocip/favicon.png deleted file mode 100644 index 37a05af29048596edc25dca9cb8cd8c826d799c0..0000000000000000000000000000000000000000 Binary files a/modules/geolocip/favicon.png and /dev/null differ diff --git a/modules/geolocip/module.py b/modules/geolocip/module.py deleted file mode 100644 index 32ac7caeadbf4e3b49bb81bc2e78fb29528992b2..0000000000000000000000000000000000000000 --- a/modules/geolocip/module.py +++ /dev/null @@ -1,72 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright(C) 2010-2011 Julien Veyssier -# -# This file is part of weboob. -# -# weboob is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# weboob is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with weboob. If not, see . - - -from weboob.capabilities.geolocip import CapGeolocIp, IpLocation -from weboob.tools.backend import Module -from weboob.deprecated.browser import Browser, BrowserUnavailable - - -__all__ = ['GeolocIpModule'] - - -class GeolocIpModule(Module, CapGeolocIp): - NAME = 'geolocip' - MAINTAINER = u'Julien Veyssier' - EMAIL = 'julien.veyssier@aiur.fr' - VERSION = '1.4' - LICENSE = 'AGPLv3+' - DESCRIPTION = u"GeolocIP IP addresses geolocation service" - BROWSER = Browser - - def get_location(self, ipaddr): - with self.browser: - - content = self.browser.readurl('http://www.geolocip.com/?s[ip]=%s&commit=locate+IP!' % str(ipaddr)) - - if content is None: - raise BrowserUnavailable() - - tab = {} - last_line = '' - line = '' - for line in content.split('\n'): - if len(line.split('
')) > 1: - key = last_line.split('
')[1].split('
')[0][0:-2] - value = line.split('
')[1].split('
')[0] - tab[key] = value - last_line = line - iploc = IpLocation(ipaddr) - iploc.city = u'%s'%tab['City'] - iploc.region = u'%s'%tab['Region'] - iploc.zipcode = u'%s'%tab['Postal code'] - iploc.country = u'%s'%tab['Country name'] - if tab['Latitude'] != '': - iploc.lt = float(tab['Latitude']) - else: - iploc.lt = 0.0 - if tab['Longitude'] != '': - iploc.lg = float(tab['Longitude']) - else: - iploc.lg = 0.0 - #iploc.host = 'NA' - #iploc.tld = 'NA' - #iploc.isp = 'NA' - - return iploc diff --git a/modules/geolocip/test.py b/modules/geolocip/test.py deleted file mode 100644 index b62dd31e924edad0c028055ccdea2c0c6ca0b695..0000000000000000000000000000000000000000 --- a/modules/geolocip/test.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright(C) 2010-2011 Julien Veyssier -# -# This file is part of weboob. -# -# weboob is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# weboob is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with weboob. If not, see . - - -from weboob.tools.test import BackendTest - - -class GeolocIPTest(BackendTest): - MODULE = 'geolocip' - - def test_geolocip(self): - self.backend.get_location('88.198.11.130')