Merge branch '1.3-branch'

2 files changed, 3 insertions, 39 deletions

diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index c44323201..f1a122c6c 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -42,7 +42,7 @@ and a :term:`scan`, you can replace the Not Found view by using the
 
    from pyramid.view import notfound_view_config
 
-   notfound_view_config()
+   @notfound_view_config()
    def notfound(request):
        return Response('Not Found, dude', status='404 Not Found')
 
@@ -64,11 +64,11 @@ views can carry predicates limiting their applicability.  For example:
 
    from pyramid.view import notfound_view_config
 
-   notfound_view_config(request_method='GET')
+   @notfound_view_config(request_method='GET')
    def notfound_get(request):
        return Response('Not Found during GET, dude', status='404 Not Found')
 
-   notfound_view_config(request_method='POST')
+   @notfound_view_config(request_method='POST')
    def notfound_post(request):
        return Response('Not Found during POST, dude', status='404 Not Found')
 
diff --git a/pyramid/tests/test_scaffolds.py b/pyramid/tests/test_scaffolds.py
deleted file mode 100644
index ed2c5a993..000000000
--- a/pyramid/tests/test_scaffolds.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import unittest
-
-class TestPyramidTemplate(unittest.TestCase):
-    def _getTargetClass(self):
-        from pyramid.scaffolds import PyramidTemplate
-        return PyramidTemplate
-
-    def _makeOne(self, name):
-        cls = self._getTargetClass()
-        return cls(name)
-
-    def test_pre_logger_eq_root(self):
-        tmpl = self._makeOne('name')
-        vars = {'package':'root'}
-        result = tmpl.pre(None, None, vars)
-        self.assertEqual(result, None)
-        self.assertEqual(vars['package_logger'], 'app')
-        self.assertTrue(len(vars['random_string']) == 40)
-
-    def test_pre_logger_noteq_root(self):
-        tmpl = self._makeOne('name')
-        vars = {'package':'notroot'}
-        result = tmpl.pre(None, None, vars)
-        self.assertEqual(result, None)
-        self.assertEqual(vars['package_logger'], 'notroot')
-        self.assertTrue(len(vars['random_string']) == 40)
-
-    def test_post(self):
-        tmpl = self._makeOne('name')
-        vars = {'package':'root'}
-        L = []
-        tmpl.out = lambda msg: L.append(msg)
-        result = tmpl.post(None, None, vars)
-        self.assertEqual(result, None)
-        self.assertEqual(L, ['Welcome to Pyramid.  Sorry for the convenience.'])
-