Merge pull request #2677 from stevepiercy/1.7-branch

Steve Piercy

2016-07-04 9ac10023baa7ca6cd8fca995d0667104fe2527bd

Merge pull request #2677 from stevepiercy/1.7-branch

Show testsetup code in rendered docs the right way.

 pyramid/decorator.py

@@ -6,32 +6,19 @@
    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:

    .. 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

    And usage of Foo:
    Python parlance, a non-data descriptor.  The following is an example and
    its usage:

    .. doctest::

        >>> from pyramid.decorator import reify

        >>> class Foo(object):
        ...     @reify
        ...     def jammy(self):
        ...         print('jammy called')
        ...         return 1

        >>> f = Foo()
        >>> v = f.jammy
        jammy called