diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-19 15:05:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-19 15:05:49 +0000 |
commit | d395bd510fa4f4376dc5237ab2f8d190a920d35d (patch) | |
tree | 3e3b16b44064938be801aede14381562bae14f6a /deluge/core/preferencesmanager.py | |
parent | Adding upstream version 2.0.3. (diff) | |
download | deluge-d395bd510fa4f4376dc5237ab2f8d190a920d35d.tar.xz deluge-d395bd510fa4f4376dc5237ab2f8d190a920d35d.zip |
Adding upstream version 2.1.1.upstream/2.1.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'deluge/core/preferencesmanager.py')
-rw-r--r-- | deluge/core/preferencesmanager.py | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py index db9556a..7e5c207 100644 --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Copyright (C) 2008-2010 Andrew Resch <andrewresch@gmail.com> # @@ -8,13 +7,13 @@ # -from __future__ import unicode_literals - import logging import os import platform import random import threading +from urllib.parse import quote_plus +from urllib.request import urlopen from twisted.internet.task import LoopingCall @@ -24,17 +23,14 @@ import deluge.configmanager from deluge._libtorrent import lt from deluge.event import ConfigValueChangedEvent +GeoIP = None try: - import GeoIP -except ImportError: - GeoIP = None - -try: - from urllib.parse import quote_plus - from urllib.request import urlopen + from GeoIP import GeoIP except ImportError: - from urllib import quote_plus - from urllib2 import urlopen + try: + from pygeoip import GeoIP + except ImportError: + pass log = logging.getLogger(__name__) @@ -202,7 +198,7 @@ class PreferencesManager(component.Component): self.__set_listen_on() def __set_listen_on(self): - """ Set the ports and interface address to listen for incoming connections on.""" + """Set the ports and interface address to listen for incoming connections on.""" if self.config['random_port']: if not self.config['listen_random_port']: self.config['listen_random_port'] = random.randrange(49152, 65525) @@ -225,13 +221,13 @@ class PreferencesManager(component.Component): self.config['listen_use_sys_port'], ) interfaces = [ - '%s:%s' % (interface, port) + f'{interface}:{port}' for port in range(listen_ports[0], listen_ports[1] + 1) ] self.core.apply_session_settings( { 'listen_system_port_fallback': self.config['listen_use_sys_port'], - 'listen_interfaces': ''.join(interfaces), + 'listen_interfaces': ','.join(interfaces), } ) @@ -400,7 +396,7 @@ class PreferencesManager(component.Component): + quote_plus(':'.join(self.config['enabled_plugins'])) ) urlopen(url) - except IOError as ex: + except OSError as ex: log.debug('Network error while trying to send info: %s', ex) else: self.config['info_sent'] = now @@ -464,11 +460,9 @@ class PreferencesManager(component.Component): # 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 - ) - except AttributeError: - log.warning('GeoIP Unavailable') + self.core.geoip_instance = GeoIP(geoipdb_path, 0) + except Exception as ex: + log.warning('GeoIP Unavailable: %s', ex) else: log.warning('Unable to find GeoIP database file: %s', geoipdb_path) |