- Removed the ``pyramid.renderers.renderer_from_name`` function. It has been

  deprecated since Pyramid 1.0, and was never an API.

5 files changed, 52 insertions, 76 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index e7b3e1968..0d2842a60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,9 @@ Backwards Incompatibilities
   or ``--python-shell`` argument, which can be any of the values ``python``,
   ``ipython`` or ``bpython``.
 
+- Removed the ``pyramid.renderers.renderer_from_name`` function.  It has been
+  deprecated since Pyramid 1.0, and was never an API.
+
 Dependencies
 ------------
 
diff --git a/TODO.txt b/TODO.txt
index 76290fbdb..1b5d82cc0 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -42,6 +42,9 @@ Must-Have
 Nice-to-Have
 ------------
 
+- Add a default-view-config-params decorator that can be applied to a class
+  which names defaults for method-based view_config decorator options.
+
 - Add narrative docs for wsgiapp and wsgiapp2.
 
 - Flesh out "Paste" narrative docs chapter.
@@ -98,15 +101,8 @@ Nice-to-Have
 Future
 ------
 
-- 1.3: Remove ``pyramid.renderers.renderer_from_name`` (deprecated).
-
 - 1.3: Kill off ``bfg.routes`` envvars in router.
 
-- 1.3: Michael's route group work
-
-- 1.3: Add a default-view-config-params decorator that can be applied to a
-  class which names defaults for method-based view_config decorator options.
-
 - 1.4: Remove ``chameleon_text`` / ``chameleon_zpt`` deprecated functions
   (render_*)
 
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index 45b00cff2..b4ec96976 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -94,6 +94,9 @@ Backwards Incompatibilities
   or ``--python-shell`` argument, which can be any of the values ``python``,
   ``ipython`` or ``bpython``.
 
+- Removed the ``pyramid.renderers.renderer_from_name`` function.  It has been
+  deprecated since Pyramid 1.0, and was never an API.
+
 Documentation Enhancements
 --------------------------
 
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index 89e5f03ea..61f5e0b35 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -4,7 +4,6 @@ import pkg_resources
 import threading
 
 from zope.interface import implementer
-from zope.deprecation import deprecated
 
 from pyramid.interfaces import (
     IChameleonLookup,
@@ -351,16 +350,6 @@ def template_renderer_factory(info, impl, lock=registry_lock):
             lock.release()
     return lookup(info)
 
-def renderer_from_name(path, package=None):
-    return RendererHelper(name=path, package=package).renderer
-
-deprecated(
-    'renderer_from_name',
-    'The "pyramid.renderers.renderer_from_name" function was never an API. '
-    'However, its use has been observed "in the wild."  It will disappear in '
-    'the next major release. To replace it, use the '
-    '``pyramid.renderers.get_renderer`` API instead. ')
-
 @implementer(IRendererInfo)
 class RendererHelper(object):
     def __init__(self, name=None, package=None, registry=None):
diff --git a/pyramid/tests/test_renderers.py b/pyramid/tests/test_renderers.py
index 1054dcb1c..dbdfb06b3 100644
--- a/pyramid/tests/test_renderers.py
+++ b/pyramid/tests/test_renderers.py
@@ -340,64 +340,6 @@ class TestChameleonRendererLookup(unittest.TestCase):
         self.assertNotEqual(reg.queryUtility(ITemplateRenderer, name=spec),
                             None)
 
-class TestRendererFromName(unittest.TestCase):
-    def setUp(self):
-        from zope.deprecation import __show__
-        __show__.off()
-        self.config = cleanUp()
-
-    def tearDown(self):
-        cleanUp()
-        from zope.deprecation import __show__
-        __show__.on()
-
-    def _callFUT(self, path, package=None):
-        from pyramid.renderers import renderer_from_name
-        return renderer_from_name(path, package)
-
-    def test_it(self):
-        registry = self.config.registry
-        settings = {}
-        registry.settings = settings
-        from pyramid.interfaces import IRendererFactory
-        import os
-        here = os.path.dirname(os.path.abspath(__file__))
-        fixture = os.path.join(here, 'fixtures/minimal.pt')
-        def factory(info, **kw):
-            return info
-        self.config.registry.registerUtility(
-            factory, IRendererFactory, name='.pt')
-        result = self._callFUT(fixture)
-        self.assertEqual(result.registry, registry)
-        self.assertEqual(result.type, '.pt')
-        self.assertEqual(result.package, None)
-        self.assertEqual(result.name, fixture)
-        self.assertEqual(result.settings, settings)
-
-    def test_it_with_package(self):
-        import pyramid
-        registry = self.config.registry
-        settings = {}
-        registry.settings = settings
-        from pyramid.interfaces import IRendererFactory
-        import os
-        here = os.path.dirname(os.path.abspath(__file__))
-        fixture = os.path.join(here, 'fixtures/minimal.pt')
-        def factory(info, **kw):
-            return info
-        self.config.registry.registerUtility(
-            factory, IRendererFactory, name='.pt')
-        result = self._callFUT(fixture, pyramid)
-        self.assertEqual(result.registry, registry)
-        self.assertEqual(result.type, '.pt')
-        self.assertEqual(result.package, pyramid)
-        self.assertEqual(result.name, fixture)
-        self.assertEqual(result.settings, settings)
-
-    def test_it_no_renderer(self):
-        self.assertRaises(ValueError, self._callFUT, 'foo')
-        
-
 class Test_json_renderer_factory(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
@@ -719,6 +661,49 @@ class TestRendererHelper(unittest.TestCase):
         self.assertEqual(cloned_helper.registry, 'registry2')
         self.assertFalse(helper is cloned_helper)
 
+    def test_renderer_absolute_file(self):
+        registry = self.config.registry
+        settings = {}
+        registry.settings = settings
+        from pyramid.interfaces import IRendererFactory
+        import os
+        here = os.path.dirname(os.path.abspath(__file__))
+        fixture = os.path.join(here, 'fixtures/minimal.pt')
+        def factory(info, **kw):
+            return info
+        self.config.registry.registerUtility(
+            factory, IRendererFactory, name='.pt')
+        result = self._makeOne(fixture).renderer
+        self.assertEqual(result.registry, registry)
+        self.assertEqual(result.type, '.pt')
+        self.assertEqual(result.package, None)
+        self.assertEqual(result.name, fixture)
+        self.assertEqual(result.settings, settings)
+
+    def test_renderer_with_package(self):
+        import pyramid
+        registry = self.config.registry
+        settings = {}
+        registry.settings = settings
+        from pyramid.interfaces import IRendererFactory
+        import os
+        here = os.path.dirname(os.path.abspath(__file__))
+        fixture = os.path.join(here, 'fixtures/minimal.pt')
+        def factory(info, **kw):
+            return info
+        self.config.registry.registerUtility(
+            factory, IRendererFactory, name='.pt')
+        result = self._makeOne(fixture, pyramid).renderer
+        self.assertEqual(result.registry, registry)
+        self.assertEqual(result.type, '.pt')
+        self.assertEqual(result.package, pyramid)
+        self.assertEqual(result.name, fixture)
+        self.assertEqual(result.settings, settings)
+
+    def test_renderer_missing(self):
+        inst = self._makeOne('foo')
+        self.assertRaises(ValueError, getattr, inst, 'renderer')
+
 class TestNullRendererHelper(unittest.TestCase):
     def setUp(self):
         self.config = cleanUp()