summaryrefslogtreecommitdiffstats
path: root/deluge/core/preferencesmanager.py
diff options
context:
space:
mode:
Diffstat (limited to 'deluge/core/preferencesmanager.py')
-rw-r--r--deluge/core/preferencesmanager.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index c250130c0..f3d104103 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -8,13 +8,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
@@ -29,13 +29,6 @@ try:
except ImportError:
GeoIP = None
-try:
- from urllib.parse import quote_plus
- from urllib.request import urlopen
-except ImportError:
- from urllib import quote_plus
- from urllib2 import urlopen
-
log = logging.getLogger(__name__)
DEFAULT_PREFS = {