summaryrefslogtreecommitdiff
path: root/repoze/bfg/chameleon_zpt.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-01-11 22:43:27 +0000
committerChris McDonough <chrism@agendaless.com>2009-01-11 22:43:27 +0000
commitb0a24149ffc4dd3b945b496e5cdb01111c8cf29a (patch)
treeda0d31fa9c46eb4e990c0df3dd116e8fa38dcd5c /repoze/bfg/chameleon_zpt.py
parentd69635eb6237055e8b3ccedeeaa7114a7beed057 (diff)
downloadpyramid-b0a24149ffc4dd3b945b496e5cdb01111c8cf29a.tar.gz
pyramid-b0a24149ffc4dd3b945b496e5cdb01111c8cf29a.tar.bz2
pyramid-b0a24149ffc4dd3b945b496e5cdb01111c8cf29a.zip
- Improve test coverage.
- Remove old cold which attempts to recover from trying to unpickle a ``z3c.pt`` template; Chameleon has been the templating engine for a good long time now. Running repoze.bfg against a sandbox that has pickled ``z3c.pt`` templates it will now just fail with an unpickling error, but can be fixed by deleting the template cache files.
Diffstat (limited to 'repoze/bfg/chameleon_zpt.py')
-rw-r--r--repoze/bfg/chameleon_zpt.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/repoze/bfg/chameleon_zpt.py b/repoze/bfg/chameleon_zpt.py
index c7d1d6949..f7e9edadf 100644
--- a/repoze/bfg/chameleon_zpt.py
+++ b/repoze/bfg/chameleon_zpt.py
@@ -1,5 +1,3 @@
-import os
-
from webob import Response
from zope.component import queryUtility
@@ -21,18 +19,7 @@ class ZPTTemplateRenderer(object):
implements(ITemplateRenderer)
def __init__(self, path, auto_reload=False):
- try:
- self.template = PageTemplateFile(path, auto_reload=auto_reload)
- except ImportError, why:
- why = str(why)
- if 'z3c.pt' in why:
- # unpickling error due to move from z3c.pt -> chameleon
- cachefile = '%s.cache' % path
- if os.path.isfile(cachefile):
- os.remove(cachefile)
- self.template = PageTemplateFile(path, auto_reload=auto_reload)
- else:
- raise
+ self.template = PageTemplateFile(path, auto_reload=auto_reload)
def implementation(self):
return self.template