Refactor code to make regular expression reuse easier.

[wizard.git] / wizard / app / php.py

diff --git a/wizard/app/php.py b/wizard/app/php.py
index 9093edf1931772450354c1dbd9e13e7a5c795698..5eb5130adbb74cc4b230b29f719d79750442966d 100644 (file)
--- a/wizard/app/php.py
+++ b/wizard/app/php.py
@@ -2,9 +2,10 @@ import re
 
 from wizard import app, util
 
-@app.filename_regex_extractor
-def make_extractor(var):
-    return 'php.ini', re.compile('^' + re.escape(var) + r'\s*=\s*(.*)$', re.M)
+def make_filename_regex(var):
+    return 'php.ini', re.compile('^(' + re.escape(var) + r'\s*=\s*)(.*)()$', re.M)
+
+make_extractor = app.filename_regex_extractor(make_filename_regex)
 
 extractors = util.dictmap(make_extractor,
         {'WIZARD_SESSIONNAME': 'session.name'