From e0ebffb8fa0af8047ab9c11fb7902419332e5680 Mon Sep 17 00:00:00 2001 From: John Garland Date: Mon, 21 Dec 2009 13:58:24 +0000 Subject: [PATCH] More relaxed definition of what a commented line is in a blocklist. Decorate readranges with raiseError rather than parse to increase performance. --- deluge/plugins/blocklist/blocklist/readers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deluge/plugins/blocklist/blocklist/readers.py b/deluge/plugins/blocklist/blocklist/readers.py index a520fad3c..125fe6a2a 100644 --- a/deluge/plugins/blocklist/blocklist/readers.py +++ b/deluge/plugins/blocklist/blocklist/readers.py @@ -60,7 +60,8 @@ class BaseReader(object): def is_ignored(self, line): """Ignore commented lines and blank lines""" - return line.startswith('#') or not line.strip() + line = line.strip() + return line.startswith('#') or not line def is_valid(self): """Determines whether file is valid for this reader""" @@ -80,6 +81,7 @@ class BaseReader(object): blocklist.close() return valid + @raiseError(ReaderParseError) def readranges(self): """Yields each ip range from the file""" blocklist = self.open() @@ -90,13 +92,11 @@ class BaseReader(object): class EmuleReader(BaseReader): """Blocklist reader for emule style blocklists""" - @raiseError(ReaderParseError) def parse(self, line): return line.strip().split(" , ")[0].split(" - ") class SafePeerReader(BaseReader): """Blocklist reader for SafePeer style blocklists""" - @raiseError(ReaderParseError) def parse(self, line): return line.strip().split(":")[-1].split("-")