Commit 29dc2f42 authored by Romain Bignon's avatar Romain Bignon

geolocip. remove broken browser1 module

parent 09fe6de4
from .module import GeolocIpModule
__all__ = ['GeolocIpModule']
# -*- 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 <http://www.gnu.org/licenses/>.
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('<dd>')) > 1:
key = last_line.split('<dt>')[1].split('</dt>')[0][0:-2]
value = line.split('<dd>')[1].split('</dd>')[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
# -*- 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 <http://www.gnu.org/licenses/>.
from weboob.tools.test import BackendTest
class GeolocIPTest(BackendTest):
MODULE = 'geolocip'
def test_geolocip(self):
self.backend.get_location('88.198.11.130')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment