Revamp 'wizard summary', and start writing tutorial docs.

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

diff --git a/wizard/app/php.py b/wizard/app/php.py
index 9093edf1931772450354c1dbd9e13e7a5c795698..ec5bdeee7b7686797d330a66570c31690d7e3813 100644 (file)
--- a/wizard/app/php.py
+++ b/wizard/app/php.py
@@ -2,12 +2,18 @@ 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 re_var(var):
+    return re.compile('^(\$' + app.expand_re(var) + r'''\s*=\s*)(.*)(;)''', re.M)
 
-extractors = util.dictmap(make_extractor,
-        {'WIZARD_SESSIONNAME': 'session.name'
-        ,'WIZARD_TMPDIR': 'upload_tmp_dir'
+def make_filename_regex(var):
+    return 'php.ini', re.compile('^(' + app.expand_re(var) + r'\s*=\s*)(.*)()$', re.M)
+
+seed = util.dictmap(make_filename_regex, {
+        'WIZARD_SESSIONNAME': 'session.name',
+        'WIZARD_TMPDIR': ('upload_tmp_dir', 'session.save_path'),
         })
 
+extractors = app.make_extractors(seed)
+substitutions = app.make_substitutions(seed)
+deprecated_keys = set([])
+