Allow specifying the location of the twitter oauth and pocket oauth files. This shoul...

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 58f747de33cf8ab627f1227137cc9e30be5227bc..5f5b81bd18fe67f23339fe631e6e7b9b3e6b25ea 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -6,7 +6,7 @@ from collections import OrderedDict
 
 # Regular expression for comments in config file
 comment_re = re.compile(
-    '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
+    '(^)[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
     re.DOTALL | re.MULTILINE
 )
 
@@ -49,6 +49,8 @@ def get_all_config():
         data.pop('ONLY_LIST', None)
         data.pop('IGNORE_LIST', None)
         data.pop('FORMAT', None)
+        data.pop('QUOTE_FORMAT', None)
+        data.pop('NOTIFY_FORMAT', None)
         return data
     except:
         return []