From c6407478e7651950d1f7ddb9367fce658eff3976 Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@intertwingly.net>
Date: Sun, 15 Apr 2007 08:22:13 -0400
Subject: [PATCH] Fix bug where use of 'exclude' config option would cause
 exception

---
 planet/config.py                     |  2 +-
 tests/data/filter/regexp-sifter2.ini |  2 ++
 tests/test_filters.py                | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/filter/regexp-sifter2.ini

diff --git a/planet/config.py b/planet/config.py
index 53195c4..d2b84e6 100644
--- a/planet/config.py
+++ b/planet/config.py
@@ -359,7 +359,7 @@ def filters(section=None):
             urllib.quote(filter(section)))
     if exclude(section):
         filters.append('regexp_sifter.py?exclude=' +
-            urllib.quote(filter(section)))
+            urllib.quote(exclude(section)))
     return filters
 
 def planet_options():
diff --git a/tests/data/filter/regexp-sifter2.ini b/tests/data/filter/regexp-sifter2.ini
new file mode 100644
index 0000000..ad8aa21
--- /dev/null
+++ b/tests/data/filter/regexp-sifter2.ini
@@ -0,0 +1,2 @@
+[Planet]
+exclude=two
diff --git a/tests/test_filters.py b/tests/test_filters.py
index 54049cb..7915667 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -111,6 +111,25 @@ class FilterTests(unittest.TestCase):
 
         self.assertNotEqual('', output)
 
+    def test_regexp_filter2(self):
+        config.load('tests/data/filter/regexp-sifter2.ini')
+
+        testfile = 'tests/data/filter/category-one.xml'
+
+        output = open(testfile).read()
+        for filter in config.filters():
+            output = shell.run(filter, output, mode="filter")
+
+        self.assertNotEqual('', output)
+
+        testfile = 'tests/data/filter/category-two.xml'
+
+        output = open(testfile).read()
+        for filter in config.filters():
+            output = shell.run(filter, output, mode="filter")
+
+        self.assertEqual('', output)
+
 try:
     from subprocess import Popen, PIPE