summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/test_config/test_views.py15
-rw-r--r--tests/test_decorator.py23
2 files changed, 23 insertions, 15 deletions
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index 65271f0d6..fcccbfba3 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -4289,21 +4289,6 @@ class Test_view_description(unittest.TestCase):
self.assertEqual(result, 'function tests.test_config.test_views.view')
-class Test_viewdefaults(unittest.TestCase):
- def _makeOne(self, wrapped):
- from pyramid.decorator import reify
-
- return reify(wrapped)
-
- def test_dunder_attrs_copied(self):
- from pyramid.config.views import viewdefaults
-
- decorator = self._makeOne(viewdefaults)
- self.assertEqual(decorator.__doc__, viewdefaults.__doc__)
- self.assertEqual(decorator.__name__, viewdefaults.__name__)
- self.assertEqual(decorator.__module__, viewdefaults.__module__)
-
-
class DummyRegistry:
utility = None
diff --git a/tests/test_decorator.py b/tests/test_decorator.py
index b9a1f1e9d..a9a16ba93 100644
--- a/tests/test_decorator.py
+++ b/tests/test_decorator.py
@@ -1,3 +1,4 @@
+import inspect
import unittest
@@ -25,6 +26,28 @@ class TestReify(unittest.TestCase):
result = decorator.__get__(None)
self.assertEqual(result, decorator)
+ def test_copy_docstring(self):
+ def wrapped(inst):
+ """Test doc"""
+ return 'a' # pragma: no cover
+
+ decorator = self._makeOne(wrapped)
+ assert decorator.__doc__ == 'Test doc'
+
+ def test_not_function(self):
+ """
+ Because reify'd methods act as attributes, it's important that they
+ aren't recognized as a function. Otherwise tools like Sphinx may
+ misbehave, like in https://github.com/Pylons/pyramid/issues/3655
+
+ """
+
+ def wrapped(inst):
+ return 'a' # pragma: no cover
+
+ decorator = self._makeOne(wrapped)
+ assert not inspect.isfunction(inspect.unwrap(decorator))
+
class Dummy:
pass