# 
# 
# patch "fileinbranch.psp"
#  from [669d559abf0b0033333d01735993bf1f93da56bb]
#    to [1a5ec0aa9530386210ccb93413817ff2772bad69]
# 
# patch "headofbranch.psp"
#  from [4202c80defa38112c39ecbf17c26e9bf97a640ff]
#    to [10181f7970817021dd721e9da72d9b06cc8ee9a1]
# 
# patch "help.psp"
#  from [d843b4cf91401b2e616177f8536d6d43c831fb7d]
#    to [69f5d6ad53fe27808ef2841c2839816ba8f175ec]
# 
# patch "index.psp"
#  from [52300f8d9c5048210dadadb1d53de2442ea60ea9]
#    to [7e7615f64309e31945a470f377f0acdf5e8ae832]
# 
# patch "revision.psp"
#  from [0d4ef551870068ee14ccf17cc0908f012920a933]
#    to [6f463be44003bf7015196427c19b940a52be7cb1]
# 
# patch "tags.psp"
#  from [82170afbb360ce8d7586aa1166fcb5777d7a8bf3]
#    to [df24079a00706530ae62c60e9224dddaf048b25c]
# 
# patch "tarofbranch.psp"
#  from [feadce980ebd565f2994099f01bd7baa58ee57b9]
#    to [7559dc9f90f183396c4dff99903f5ea1f12e01cc]
# 
# patch "wrapper.py"
#  from [f7cb39709eb28cd4a813ef00e8f2e5ac2086dfa0]
#    to [c5ff5ec5ea7868257307f1cf0731868986d38772]
# 
============================================================
--- fileinbranch.psp	669d559abf0b0033333d01735993bf1f93da56bb
+++ fileinbranch.psp	1a5ec0aa9530386210ccb93413817ff2772bad69
@@ -1,11 +1,9 @@
 <%
 
 import config
 import monotone
 import common
 import urllib
-import template
-from template import header,footer
 from common import link
 
 psp.set_error_page("error.psp")
@@ -54,7 +52,7 @@
 else:
 	hq = common.html_escape()
 	info = {'title' : "Latest version of %s in branch %s" % (hq(path), hq(branch))}
-	req.write(header(info))
+	req.write(template.header(info))
 %>
 <p>
 The branch you have selected has multiple head revisions, and the file you are attempting 
============================================================
--- headofbranch.psp	4202c80defa38112c39ecbf17c26e9bf97a640ff
+++ headofbranch.psp	10181f7970817021dd721e9da72d9b06cc8ee9a1
@@ -1,11 +1,9 @@
 <%
 
 import config
 import monotone
 import common
 import urllib
-import template
-from template import header,footer
 from common import link
 
 psp.set_error_page("error.psp")
@@ -34,7 +32,7 @@
 else:
 	hq = common.html_escape()
 	info = {'title' : "Branch details for %s" % (hq(branch))}
-	req.write(header(info))
+	req.write(template.header(info))
 %>
 <p>
 The following head IDs are available. Please select one to view.
============================================================
--- help.psp	d843b4cf91401b2e616177f8536d6d43c831fb7d
+++ help.psp	69f5d6ad53fe27808ef2841c2839816ba8f175ec
@@ -1,14 +1,12 @@
 <%
 
 import config
 import common
 import urllib
-import template
-from template import header,footer
 
 psp.set_error_page("error.psp")
 info = { 'title' : "Help" }
-req.write(header(info))
+req.write(template.header(info))
 
 hq = common.html_escape()
 %>
============================================================
--- index.psp	52300f8d9c5048210dadadb1d53de2442ea60ea9
+++ index.psp	7e7615f64309e31945a470f377f0acdf5e8ae832
@@ -1,9 +1,6 @@
 <%
 
-import config
-import monotone
 import common
-import urllib
 from common import link
 
 psp.set_error_page("error.psp")
============================================================
--- revision.psp	0d4ef551870068ee14ccf17cc0908f012920a933
+++ revision.psp	6f463be44003bf7015196427c19b940a52be7cb1
@@ -1,11 +1,9 @@
 <%
 
 import config
 import monotone
 import common
 import urllib
-import template
-from template import header,footer
 from common import link
 
 # 
@@ -26,7 +24,7 @@
 
 hq = common.html_escape()
 info = {'title' : "Revision %s" % (hq(id))}
-req.write(header(info))
+req.write(template.header(info))
 
 ancestry_limit = 10
 ancestry_maximum = 100
============================================================
--- tags.psp	82170afbb360ce8d7586aa1166fcb5777d7a8bf3
+++ tags.psp	df24079a00706530ae62c60e9224dddaf048b25c
@@ -1,16 +1,14 @@
 <%
 
 import config
 import monotone
 import common
 import urllib
-import template
-from template import header,footer
 from common import link
 
 psp.set_error_page("error.psp")
 info = { 'title' : "Tags" }
-req.write(header(info))
+req.write(template.header(info))
 
 hq = common.html_escape()
 tags = mt.tags()
============================================================
--- tarofbranch.psp	feadce980ebd565f2994099f01bd7baa58ee57b9
+++ tarofbranch.psp	7559dc9f90f183396c4dff99903f5ea1f12e01cc
@@ -1,11 +1,8 @@
 <%
 
-import config
 import monotone
 import common
 import urllib
-import template
-from template import header,footer
 from common import link
 
 psp.set_error_page("error.psp")
@@ -30,7 +27,7 @@
 else:
 	hq = common.html_escape()
 	info = {'title' : "Latest tar file of branch %s" % (hq(branch))}
-	req.write(header(info))
+	req.write(template.header(info))
 %>
 <p>
 The branch you have selected has multiple head revisions The head
============================================================
--- wrapper.py	f7cb39709eb28cd4a813ef00e8f2e5ac2086dfa0
+++ wrapper.py	c5ff5ec5ea7868257307f1cf0731868986d38772
@@ -5,13 +5,12 @@
 import mimetypes
 import urllib
 import os.path
-import template
 import tarfile
 import os
 import re
 
 from monotone import Monotone
-from template import Template
+from html import Template
 
 # paranoid
 sane_uri_re = re.compile('^\w+$')
@@ -125,8 +124,8 @@
 				'template' : Template()
 			}
 			req.register_cleanup(cleanup, (req, vars))
-			template = psp.PSP(req, filename=uri, vars=vars)
-			template.run()
+			instance = psp.PSP(req, filename=uri, vars=vars)
+			instance.run()
 			return apache.OK
 	except ValueError:
 		return apache.HTTP_NOT_FOUND