From b0a24149ffc4dd3b945b496e5cdb01111c8cf29a Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 11 Jan 2009 22:43:27 +0000 Subject: - 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. --- repoze/bfg/chameleon_zpt.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'repoze/bfg/chameleon_zpt.py') 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 -- cgit v1.2.3