--- a/do_edit_kw.py	Fri Oct 24 14:19:30 2003 -0400
+++ b/do_edit_kw.py	Fri Oct 24 17:04:29 2003 -0400
@@ -11,24 +11,22 @@
 
 # import cgitb; cgitb.enable()
 import cgi
-from htmltmpl import TemplateManager
-from webutils import get_template_processor
+from templates import Template
 import my_db
 from bkmark import Bookmark
-from webutils import get_keywords
+from keywords import get_keywords
 import os
 
 def main(action, sel_keywords, keywords, prefs):
-    tmpl = TemplateManager().prepare("kw_confirm.tmpl")
-    tproc = get_template_processor(prefs)
-    tproc.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Confirmation")
-    tproc.set("confirm_delete", action == 'delete')
-    tproc.set("confirm_merge", action == 'merge')
-    tproc.set("confirm_rename", action == 'rename')
-    tproc.set("action", action)
-    tproc.set("Selected", sel_keywords)
-    tproc.set("Keywords", keywords)
-    print tproc.process(tmpl)
+    tmpl = Template("kw_confirm.tmpl", prefs)
+    tmpl.set("pagetitle", os.environ["REMOTE_USER"]+"'s XBELWeb Confirmation")
+    tmpl.set("confirm_delete", action == 'delete')
+    tmpl.set("confirm_merge", action == 'merge')
+    tmpl.set("confirm_rename", action == 'rename')
+    tmpl.set("action", action)
+    tmpl.set("Selected", sel_keywords)
+    tmpl.set("Keywords", keywords)
+    print tmpl.process()
 
 if (__name__ == "__main__"):
     form = cgi.FieldStorage()