Merge pull request #2676 from stevepiercy/master

Show testsetup code in rendered docs the right way.

1 files changed, 9 insertions, 22 deletions

diff --git a/pyramid/decorator.py b/pyramid/decorator.py
index e3a8c707f..065a3feed 100644
--- a/pyramid/decorator.py
+++ b/pyramid/decorator.py
@@ -6,31 +6,18 @@ class reify(object):
     Python ``@property`` decorator, but it puts the result of the method it
     decorates into the instance dict after the first call, effectively
     replacing the function it decorates with an instance variable.  It is, in
-    Python parlance, a non-data descriptor.  An example:
+    Python parlance, a non-data descriptor.  The following is an example and
+    its usage:
 
-    .. code-block:: python
-
-        from pyramid.decorator import reify
-
-        class Foo(object):
-            @reify
-            def jammy(self):
-                print('jammy called')
-                return 1
-
-    .. testsetup::
-
-        from pyramid.decorator import reify
-
-        class Foo(object):
-            @reify
-            def jammy(self):
-                print('jammy called')
-                return 1
+    .. doctest::
 
-    And usage of Foo:
+        >>> from pyramid.decorator import reify
 
-    .. doctest::
+        >>> class Foo(object):
+        ...     @reify
+        ...     def jammy(self):
+        ...         print('jammy called')
+        ...         return 1
 
         >>> f = Foo()
         >>> v = f.jammy