diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2013-09-03 18:02:19 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2013-09-03 18:02:19 -0600 |
| commit | 59801aaeaf431e1b66dee51e3774a5254c84b11c (patch) | |
| tree | dd84fd38b7e1eb6ee3293390789672d8fbca1a1f | |
| parent | 90fd4bc7063b6791f2e86be30c10039a011ea2ed (diff) | |
| download | pyramid-59801aaeaf431e1b66dee51e3774a5254c84b11c.tar.gz pyramid-59801aaeaf431e1b66dee51e3774a5254c84b11c.tar.bz2 pyramid-59801aaeaf431e1b66dee51e3774a5254c84b11c.zip | |
Remove last references to mako
We remove the default addition of .mak/.mako files in the configuration
object, and we remove the test to see if it is has been defined as a
renderer.
| -rw-r--r-- | pyramid/config/rendering.py | 4 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_init.py | 2 | ||||
| -rw-r--r-- | setup.py | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/pyramid/config/rendering.py b/pyramid/config/rendering.py index 6a456fd61..a46d1f37f 100644 --- a/pyramid/config/rendering.py +++ b/pyramid/config/rendering.py @@ -14,13 +14,9 @@ from pyramid import ( chameleon_zpt, ) -from pyramid_mako 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), ) diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py index b8cbbd676..531357e7f 100644 --- a/pyramid/tests/test_config/test_init.py +++ b/pyramid/tests/test_config/test_init.py @@ -72,8 +72,6 @@ class ConfiguratorTests(unittest.TestCase): if not PYPY: self.assertTrue(config.registry.getUtility(IRendererFactory, '.pt')) self.assertTrue(config.registry.getUtility(IRendererFactory,'.txt')) - self.assertTrue(config.registry.getUtility(IRendererFactory, '.mak')) - self.assertTrue(config.registry.getUtility(IRendererFactory, '.mako')) def test_begin(self): from pyramid.config import Configurator @@ -47,7 +47,6 @@ install_requires=[ 'venusian >= 1.0a3', # ``ignore`` 'translationstring >= 0.4', # py3 compat 'PasteDeploy >= 1.5.0', # py3 compat - 'pyramid_mako', # Backwards compat ... ] tests_require = [ |
