From 29dc2f428c84daac16aee6afd295cfc3b33fec4d Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@symlink.me>
Date: Sat, 5 Jan 2019 15:24:27 +0100
Subject: [PATCH] geolocip. remove broken browser1 module

---
 modules/geolocip/__init__.py |   3 --
 modules/geolocip/favicon.png | Bin 3850 -> 0 bytes
 modules/geolocip/module.py   |  72 -----------------------------------
 modules/geolocip/test.py     |  28 --------------
 4 files changed, 103 deletions(-)
 delete mode 100644 modules/geolocip/__init__.py
 delete mode 100644 modules/geolocip/favicon.png
 delete mode 100644 modules/geolocip/module.py
 delete mode 100644 modules/geolocip/test.py

diff --git a/modules/geolocip/__init__.py b/modules/geolocip/__init__.py
deleted file mode 100644
index c3ae46d455..0000000000
--- 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
GIT binary patch
literal 0
HcmV?d00001

literal 3850
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
M07*qoM6N<$f}J^5c>n+a

diff --git a/modules/geolocip/module.py b/modules/geolocip/module.py
deleted file mode 100644
index 32ac7caead..0000000000
--- 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 <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
diff --git a/modules/geolocip/test.py b/modules/geolocip/test.py
deleted file mode 100644
index b62dd31e92..0000000000
--- 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 <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')
-- 
GitLab