- 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.

1 files changed, 1 insertions, 15 deletions

diff --git a/repoze/bfg/chameleon_genshi.py b/repoze/bfg/chameleon_genshi.py
index f3541ba4b..3d8472203 100644
--- a/repoze/bfg/chameleon_genshi.py
+++ b/repoze/bfg/chameleon_genshi.py
@@ -1,5 +1,3 @@
-import os
-
 from webob import Response
 
 from zope.component import queryUtility
@@ -21,19 +19,7 @@ class GenshiTemplateRenderer(object):
     implements(ITemplateRenderer)
 
     def __init__(self, path, auto_reload=False):
-        try:
-            self.template = GenshiTemplateFile(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 = GenshiTemplateFile(path,
-                                                   auto_reload=auto_reload)
-            else:
-                raise
+        self.template = GenshiTemplateFile(path, auto_reload=auto_reload)
 
     def implementation(self):
         return self.template