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