From bf00c3ae0f03eb81579a2ce3f1886b2acdc1e462 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Sep 2011 16:28:26 -0400 Subject: chameleon runs on pypy now, no need to do conditional imports --- pyramid/config/rendering.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pyramid/config/rendering.py b/pyramid/config/rendering.py index cba6090b5..c652a980c 100644 --- a/pyramid/config/rendering.py +++ b/pyramid/config/rendering.py @@ -7,28 +7,19 @@ from pyramid.interfaces import PHASE1_CONFIG from pyramid.config.util import action_method from pyramid import renderers +from pyramid import chameleon_text +from pyramid import chameleon_zpt from pyramid.mako_templating import renderer_factory as mako_renderer_factory DEFAULT_RENDERERS = ( + ('.txt', chameleon_text.renderer_factory), + ('.pt', chameleon_zpt.renderer_factory), ('.mak', mako_renderer_factory), ('.mako', mako_renderer_factory), ('json', renderers.json_renderer_factory), ('string', renderers.string_renderer_factory), ) -try: - from pyramid import chameleon_text - DEFAULT_RENDERERS += (('.txt', chameleon_text.renderer_factory),) -except TypeError: # pragma: no cover - pass # pypy - -try: - from pyramid import chameleon_zpt - DEFAULT_RENDERERS += (('.pt', chameleon_zpt.renderer_factory),) -except TypeError: # pragma: no cover - pass #pypy - - class RenderingConfiguratorMixin(object): @action_method def add_renderer(self, name, factory): -- cgit v1.2.3