Support pygeoip for ip lookups

[Calum]

Alpine linux only packages the pure-python ​pygeoip as py3-geoip which is not the same as the ​MaxMind GeoIP (python3-geoip on Ubuntu).

However they packages are compatible with some minor changes:

deluge/core/preferencesmanager.py

@@ -24 +24 @@
 from deluge._libtorrent import lt
 from deluge.event import ConfigValueChangedEvent
 
+GeoIP = None
 try:
-    import GeoIP
+    from GeoIP import GeoIP
 except ImportError:
-    GeoIP = None
+    try:
+        from pygeoip import GeoIP
+    except ImportError:
+        pass
 
 try:
     from urllib.parse import quote_plus
@@ -464 +469 @@
         # Load the GeoIP DB for country look-ups if available
         if os.path.exists(geoipdb_path):
             try:
-                self.core.geoip_instance = GeoIP.open(
-                    geoipdb_path, GeoIP.GEOIP_STANDARD
-                )
+                self.core.geoip_instance = GeoIP(geoipdb_path, 0)
             except AttributeError:
                 log.warning('GeoIP Unavailable')
         else:

[Calum]

Ticket retargeted after milestone closed

[Calum]

Ticket retargeted after milestone closed

[Calum]

Fixed by: [65e5010e7fbd]