From 95d826b77c3731a7dc31d6c6a12fc01a430d3022 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Sun, 5 Nov 2017 20:52:43 +0000 Subject: [PATCH] [#3127|Blocklist] Fix importing blocklist with encoded lines There are some blocklists with encoded names that break upon importing so decode lines to unicode. Need to use decode_bytes as not all encoded lines are utf8! --- deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py index c96f1d0ed..bbae72368 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/readers.py @@ -12,6 +12,7 @@ from __future__ import unicode_literals import logging import re +from deluge.common import decode_bytes from .common import IP, BadIP, raises_errors_as log = logging.getLogger(__name__) @@ -54,6 +55,7 @@ class BaseReader(object): blocklist = self.open() valid = True for line in blocklist: + line = decode_bytes(line) if not self.is_ignored(line): try: (start, end) = self.parse(line) @@ -71,6 +73,7 @@ class BaseReader(object): """Yields each ip range from the file""" blocklist = self.open() for line in blocklist: + line = decode_bytes(line) if not self.is_ignored(line): yield self.parse(line) blocklist.close()