[Py2to3] Force unicode_literals and fix related issues

* Added `from __future__ import unicode_literals` to every file so
   now all strings in code are forced to be unicode strings unless
   marked as byte string `b'str'` or encoded to byte string `'str'.encode('utf-8')`.

   This is a large change but we have been working towards the goal of unicode
   strings passed in the code so decoding external input and encoding
   output as byte strings (where applicable).

   Note that in Python 2 the `str` type still refers to byte strings.

 * Replaced the use of `str` for `basestring` in isinstance comparison as
   this was the original intention but breaks code when encoutering unicode strings.

 * Marked byte strings in gtkui as the conversion to utf8 is not always handled, mostly
   related to gobject signal names.

deluge/__init__.py

@@ -1,4 +1,6 @@
 """Deluge"""
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/__rpcapi.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from new import classobj
 
 from deluge.core.core import Core

deluge/_libtorrent.py

@@ -15,6 +15,7 @@ Example:
     >>> from deluge._libtorrent import lt
 
 """
+from __future__ import unicode_literals
 
 from deluge.common import VersionSplit, get_version
 

deluge/common.py

@@ -8,7 +8,7 @@
 #
 
 """Common functions for various parts of Deluge to use."""
-from __future__ import division, print_function
+from __future__ import division, print_function, unicode_literals
 
 import base64
 import functools
@@ -800,7 +800,7 @@ def decode_string(s, encoding='utf8'):
 
     """
     if not s:
-        return u''
+        return ''
     elif isinstance(s, unicode):
         return s
 
@@ -817,7 +817,7 @@ def decode_string(s, encoding='utf8'):
             return s.decode(*l())
         except UnicodeDecodeError:
             pass
-    return u''
+    return ''
 
 
 def utf8_encoded(s, encoding='utf8'):
@@ -871,6 +871,7 @@ class VersionSplit(object):
             vs = ver.replace('_', '-').split('-')
 
         self.version = [int(x) for x in vs[0].split('.') if x.isdigit()]
+        self.version_string = ''.join(str(x) for x in vs[0].split('.') if x.isdigit())
         self.suffix = None
         self.dev = False
         if len(vs) > 1:

deluge/component.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import traceback
 from collections import defaultdict
@@ -305,7 +307,7 @@ class ComponentRegistry(object):
         # Start all the components if names is empty
         if not names:
             names = self.components.keys()
-        elif isinstance(names, str):
+        elif isinstance(names, basestring):
             names = [names]
 
         def on_depends_started(result, name):
@@ -339,7 +341,7 @@ class ComponentRegistry(object):
         """
         if not names:
             names = self.components.keys()
-        elif isinstance(names, str):
+        elif isinstance(names, basestring):
             names = [names]
 
         def on_dependents_stopped(result, name):
@@ -377,7 +379,7 @@ class ComponentRegistry(object):
         """
         if not names:
             names = self.components.keys()
-        elif isinstance(names, str):
+        elif isinstance(names, basestring):
             names = [names]
 
         deferreds = []
@@ -403,7 +405,7 @@ class ComponentRegistry(object):
         """
         if not names:
             names = self.components.keys()
-        elif isinstance(names, str):
+        elif isinstance(names, basestring):
             names = [names]
 
         deferreds = []

deluge/config.py

@@ -39,6 +39,7 @@ this can only be done for the 'config file version' and not for the 'format'
 version as this will be done internally.
 
 """
+from __future__ import unicode_literals
 
 import cPickle as pickle
 import json
@@ -46,7 +47,7 @@ import logging
 import os
 import shutil
 
-from deluge.common import get_default_config_dir, utf8_encoded
+from deluge.common import decode_string, get_default_config_dir, utf8_encoded
 
 log = logging.getLogger(__name__)
 callLater = None  # Necessary for the config tests
@@ -243,11 +244,8 @@ class Config(object):
             5
 
         """
-        if isinstance(self.__config[key], str):
+        if isinstance(self.__config[key], basestring):
-            try:
+            return decode_string(self.__config[key])
-                return self.__config[key].decode('utf8')
-            except UnicodeDecodeError:
-                return self.__config[key]
         else:
             return self.__config[key]
 

deluge/configmanager.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import os
 

deluge/core/alertmanager.py

@@ -15,6 +15,7 @@ This should typically only be used by the Core. Plugins should utilize the
 `:mod:EventManager` for similar functionality.
 
 """
+from __future__ import unicode_literals
 
 import logging
 

deluge/core/authmanager.py

@@ -8,6 +8,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import os
 import shutil

deluge/core/core.py

@@ -8,7 +8,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import base64
 import glob

deluge/core/daemon.py

@@ -8,6 +8,7 @@
 #
 
 """The Deluge daemon"""
+from __future__ import unicode_literals
 
 import logging
 import os

deluge/core/daemon_entry.py

@@ -7,7 +7,7 @@
 # the additional special exception to link portions of this program with the OpenSSL library.
 # See LICENSE for more details.
 #
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import os
 import sys

deluge/core/eventmanager.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 import deluge.component as component

deluge/core/filtermanager.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 import deluge.component as component

deluge/core/pluginmanager.py

@@ -9,6 +9,7 @@
 
 
 """PluginManager for Core"""
+from __future__ import unicode_literals
 
 import logging
 

deluge/core/preferencesmanager.py

@@ -8,6 +8,8 @@
 #
 
 
+from __future__ import unicode_literals
+
 import logging
 import os
 import random

deluge/core/rpcserver.py

@@ -8,6 +8,7 @@
 #
 
 """RPCServer Module"""
+from __future__ import unicode_literals
 
 import logging
 import os

deluge/core/torrent.py

@@ -14,7 +14,7 @@ Attributes:
 
 """
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import logging
 import os

deluge/core/torrentmanager.py

@@ -8,6 +8,7 @@
 #
 
 """TorrentManager handles Torrent objects"""
+from __future__ import unicode_literals
 
 import cPickle
 import datetime

deluge/decorators.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import inspect
 import re
 import warnings

deluge/error.py

@@ -9,6 +9,9 @@
 #
 
 
+from __future__ import unicode_literals
+
+
 class DelugeError(Exception):
 
     def __new__(cls, *args, **kwargs):

deluge/event.py

@@ -14,6 +14,7 @@ This module describes the types of events that can be generated by the daemon
 and subsequently emitted to the clients.
 
 """
+from __future__ import unicode_literals
 
 known_events = {}
 

deluge/httpdownloader.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import os.path
 import zlib

deluge/log.py

@@ -9,6 +9,7 @@
 #
 
 """Logging functions"""
+from __future__ import unicode_literals
 
 import inspect
 import logging

deluge/maketorrent.py

@@ -7,7 +7,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import os
 import sys

deluge/metafile.py

@@ -11,7 +11,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import logging
 import os.path

deluge/path_chooser_common.py

@@ -8,6 +8,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import os
 
 

deluge/pluginmanagerbase.py

@@ -9,6 +9,7 @@
 
 
 """PluginManagerBase"""
+from __future__ import unicode_literals
 
 import logging
 import os.path

deluge/plugins/AutoAdd/deluge/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/AutoAdd/deluge/plugins/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/AutoAdd/deluge/plugins/autoadd/__init__.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/AutoAdd/deluge/plugins/autoadd/common.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import os
 
 import pkg_resources

deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py

@@ -13,6 +13,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import base64
 import logging
 import os

deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import os
 

deluge/plugins/AutoAdd/deluge/plugins/autoadd/webui.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 from deluge.plugins.pluginbase import WebPluginBase

deluge/plugins/AutoAdd/setup.py

@@ -13,6 +13,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from setuptools import find_packages, setup
 
 __plugin_name__ = 'AutoAdd'

deluge/plugins/Blocklist/deluge/__init__.py

@@ -1,2 +1,4 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 __import__('pkg_resources').declare_namespace(__name__)

deluge/plugins/Blocklist/deluge/plugins/__init__.py

@@ -1,2 +1,4 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 __import__('pkg_resources').declare_namespace(__name__)

deluge/plugins/Blocklist/deluge/plugins/blocklist/__init__.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/Blocklist/deluge/plugins/blocklist/common.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import os.path
 from functools import wraps
 from sys import exc_info

deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py

@@ -8,7 +8,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import logging
 import os

deluge/plugins/Blocklist/deluge/plugins/blocklist/decompressers.py

@@ -8,6 +8,8 @@
 #
 # pylint: disable=redefined-builtin
 
+from __future__ import unicode_literals
+
 import bz2
 import gzip
 import zipfile

deluge/plugins/Blocklist/deluge/plugins/blocklist/detect.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from .decompressers import BZipped2, GZipped, Zipped
 from .readers import EmuleReader, PeerGuardianReader, SafePeerReader
 

deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 from datetime import datetime
 

deluge/plugins/Blocklist/deluge/plugins/blocklist/peerguardian.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import gzip
 import logging
 import socket

deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import re
 

deluge/plugins/Blocklist/deluge/plugins/blocklist/webui.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 from deluge.plugins.pluginbase import WebPluginBase

deluge/plugins/Blocklist/setup.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from setuptools import find_packages, setup
 
 __plugin_name__ = 'Blocklist'

deluge/plugins/Execute/deluge/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Execute/deluge/plugins/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Execute/deluge/plugins/execute/__init__.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/Execute/deluge/plugins/execute/common.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import os.path
 
 import pkg_resources

deluge/plugins/Execute/deluge/plugins/execute/core.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import hashlib
 import logging
 import os

deluge/plugins/Execute/deluge/plugins/execute/gtkui.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 import gtk

deluge/plugins/Execute/deluge/plugins/execute/webui.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 from deluge.plugins.pluginbase import WebPluginBase

deluge/plugins/Execute/setup.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from setuptools import find_packages, setup
 
 __plugin_name__ = 'Execute'

deluge/plugins/Extractor/deluge/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Extractor/deluge/plugins/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Extractor/deluge/plugins/extractor/__init__.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/Extractor/deluge/plugins/extractor/common.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import os
 
 import pkg_resources

deluge/plugins/Extractor/deluge/plugins/extractor/core.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import errno
 import logging
 import os

deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 import gtk

deluge/plugins/Extractor/deluge/plugins/extractor/webui.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 from deluge.plugins.pluginbase import WebPluginBase

deluge/plugins/Extractor/setup.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from setuptools import find_packages, setup
 
 __plugin_name__ = 'Extractor'

deluge/plugins/Label/deluge/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Label/deluge/plugins/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Label/deluge/plugins/label/__init__.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/Label/deluge/plugins/label/core.py

@@ -15,6 +15,7 @@
 torrent-label core plugin.
 adds a status field for tracker.
 """
+from __future__ import unicode_literals
 
 import logging
 import re

deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 from deluge import component  # for systray

deluge/plugins/Label/deluge/plugins/label/gtkui/label_config.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import os
 

deluge/plugins/Label/deluge/plugins/label/gtkui/sidebar_menu.py

@@ -8,6 +8,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 import gtk

deluge/plugins/Label/deluge/plugins/label/gtkui/submenu.py

@@ -8,6 +8,8 @@
 #
 
 
+from __future__ import unicode_literals
+
 import logging
 
 import gtk

deluge/plugins/Label/deluge/plugins/label/test.py

@@ -10,7 +10,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from deluge.ui.client import sclient
 

deluge/plugins/Label/deluge/plugins/label/webui.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import os
 

deluge/plugins/Label/setup.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from setuptools import find_packages, setup
 
 __plugin_name__ = 'Label'

deluge/plugins/Notifications/deluge/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Notifications/deluge/plugins/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Notifications/deluge/plugins/notifications/__init__.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/Notifications/deluge/plugins/notifications/common.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 from twisted.internet import defer

deluge/plugins/Notifications/deluge/plugins/notifications/core.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import smtplib
 from email.utils import formatdate

deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 from os.path import basename
 

deluge/plugins/Notifications/deluge/plugins/notifications/test.py

@@ -6,6 +6,8 @@
 # License: BSD - Please view the LICENSE file for additional information.
 # ==============================================================================
 
+from __future__ import unicode_literals
+
 import logging
 
 from twisted.internet import task

deluge/plugins/Notifications/deluge/plugins/notifications/webui.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 
 from deluge.plugins.pluginbase import WebPluginBase

deluge/plugins/Notifications/setup.py

@@ -12,6 +12,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from setuptools import find_packages, setup
 
 __plugin_name__ = 'Notifications'

deluge/plugins/Scheduler/deluge/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Scheduler/deluge/plugins/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Scheduler/deluge/plugins/scheduler/__init__.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/Scheduler/deluge/plugins/scheduler/common.py

@@ -12,6 +12,9 @@
 #
 
 
+from __future__ import unicode_literals
+
+
 def get_resource(filename):
     import os
     import pkg_resources

deluge/plugins/Scheduler/deluge/plugins/scheduler/core.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import logging
 import time
 

deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py

@@ -11,7 +11,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import logging
 

deluge/plugins/Scheduler/deluge/plugins/scheduler/webui.py

@@ -1,4 +1,3 @@
-#
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Andrew Resch <andrewresch@gmail.com>
@@ -11,6 +10,7 @@
 # the additional special exception to link portions of this program with the OpenSSL library.
 # See LICENSE for more details.
 #
+from __future__ import unicode_literals
 
 import logging
 

deluge/plugins/Scheduler/setup.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from setuptools import find_packages, setup
 
 __plugin_name__ = 'Scheduler'

deluge/plugins/Stats/deluge/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Stats/deluge/plugins/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 # this is a namespace package
 import pkg_resources
 

deluge/plugins/Stats/deluge/plugins/stats/__init__.py

@@ -11,6 +11,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 from deluge.plugins.init import PluginInitBase
 
 

deluge/plugins/Stats/deluge/plugins/stats/common.py

@@ -7,6 +7,8 @@
 # See LICENSE for more details.
 #
 
+from __future__ import unicode_literals
+
 import os.path
 
 import pkg_resources

deluge/plugins/Stats/deluge/plugins/stats/core.py

@@ -1,4 +1,3 @@
-#
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Ian Martin <ianmartin@cantab.net>
@@ -11,7 +10,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import logging
 import time

deluge/plugins/Stats/deluge/plugins/stats/graph.py

@@ -1,4 +1,3 @@
-#
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Ian Martin <ianmartin@cantab.net>
@@ -15,7 +14,7 @@
 port of old plugin by markybob.
 """
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import logging
 import math

deluge/plugins/Stats/deluge/plugins/stats/gtkui.py

@@ -12,7 +12,7 @@
 # See LICENSE for more details.
 #
 
-from __future__ import division
+from __future__ import division, unicode_literals
 
 import logging
 

deluge/plugins/Stats/deluge/plugins/stats/tests/test_stats.py

@@ -4,7 +4,7 @@
 # the additional special exception to link portions of this program with the OpenSSL library.
 # See LICENSE for more details.
 #
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import pytest
 from twisted.internet import defer