Changeset 6b396f

Timestamp:

12/21/2009 01:58:24 PM (15 years ago)

Author:

John Garland <johnnyg@gmail.com>

Children:

6a8e023

Parents:

b2990e

Message:

More relaxed definition of what a commented line is in a blocklist.
Decorate readranges with raiseError rather than parse to increase performance.

Files:

• ChangeLog (modified) (1 diff)
• deluge/plugins/blocklist/blocklist/readers.py (modified) (4 diffs)

ChangeLog

@@ -13 +13 @@
         * Fix blocklist status icon not opening the blocklist preference
           page in certain locales
+        * Fix blocklist not recognising comments that begin with whitespace
+        * Minor speedup in parsing blocklists
 
 === Deluge 1.2.0_rc5 (17 December 2009) ===

deluge/plugins/blocklist/blocklist/readers.py

@@ -61 +61 @@
     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):
@@ -81 +82 @@
         return valid
 
+    @raiseError(ReaderParseError)
     def readranges(self):
         """Yields each ip range from the file"""
@@ -91 +93 @@
 class EmuleReader(BaseReader):
     """Blocklist reader for emule style blocklists"""
-    @raiseError(ReaderParseError)
     def parse(self, line):
         return line.strip().split(" , ")[0].split(" - ")
@@ -97 +98 @@
 class SafePeerReader(BaseReader):
     """Blocklist reader for SafePeer style blocklists"""
-    @raiseError(ReaderParseError)
     def parse(self, line):
         return line.strip().split(":")[-1].split("-")