Deluge
diff options
| author | Calum Lind <calumlind@gmail.com> | 2018-10-24 11:33:16 +0100 |
|---|---|---|
| committer | Calum Lind <calumlind@gmail.com> | 2018-11-02 08:45:40 +0000 |
| commit | bb6e290bf8979e5d1ed3ebd85a7db033b172ef09 (patch) | |
| tree | 3d986da7230bb7c12d391f1df79fdc3fdb75427a | |
| parent | 4a79e1f100ebe4e5bb1d33523a142d5eb6ab9629 (diff) | |
| download | deluge-bb6e290bf8979e5d1ed3ebd85a7db033b172ef09.tar.gz deluge-bb6e290bf8979e5d1ed3ebd85a7db033b172ef09.tar.bz2 deluge-bb6e290bf8979e5d1ed3ebd85a7db033b172ef09.zip | |
[GTK3] Fix UnicodeWarning in row comparison on Python 2
| -rw-r--r-- | deluge/ui/gtk3/details_tab.py | 4 | ||||
| -rw-r--r-- | deluge/ui/gtk3/torrentview.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/deluge/ui/gtk3/details_tab.py b/deluge/ui/gtk3/details_tab.py index 98a60ceb5..2431e0836 100644 --- a/deluge/ui/gtk3/details_tab.py +++ b/deluge/ui/gtk3/details_tab.py @@ -13,7 +13,7 @@ import logging from xml.sax.saxutils import escape as xml_escape import deluge.component as component -from deluge.common import fdate, fsize, is_url +from deluge.common import decode_bytes, fdate, fsize, is_url from .tab_data_funcs import fdate_or_dash, fpieces_num_size from .torrentdetails import Tab @@ -63,7 +63,7 @@ class DetailsTab(Tab): # Update all the label widgets for widget in self.tab_widgets.values(): txt = xml_escape(self.widget_status_as_fstr(widget, status)) - if widget.obj.get_text() != txt: + if decode_bytes(widget.obj.get_text()) != txt: if 'comment' in widget.status_keys and is_url(txt): widget.obj.set_markup('<a href="%s">%s</a>' % (txt, txt)) else: diff --git a/deluge/ui/gtk3/torrentview.py b/deluge/ui/gtk3/torrentview.py index f6313da07..cad5286e5 100644 --- a/deluge/ui/gtk3/torrentview.py +++ b/deluge/ui/gtk3/torrentview.py @@ -20,6 +20,7 @@ from gi.repository.Gtk import EntryIconPosition from twisted.internet import reactor import deluge.component as component +from deluge.common import decode_bytes from deluge.ui.client import client from . import torrentview_data_funcs as funcs @@ -663,7 +664,7 @@ class TorrentView(ListView, component.Component): to_update = [] for i, status_field in fields_to_update: row_value = status[torrent_id][status_field] - if row[i] != row_value: + if decode_bytes(row[i]) != row_value: to_update.append(i) to_update.append(row_value) # Update fields in the liststore |