From 4a6f532316421ef85caefc706e191d6977e71feb Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 11 Mar 2012 21:05:04 -0700
Subject: [PATCH] - ``config.add_view(<aninstancemethod>)`` raised
 AttributeError involving   ``__text__``.  See
 https://github.com/Pylons/pyramid/issues/461

Fixes #461.
---
 CHANGES.txt                             | 9 +++++++++
 pyramid/config/views.py                 | 9 +++++----
 pyramid/tests/test_config/test_views.py | 6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8076bc35db..abdb3d80a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+Next release
+============
+
+Bug Fixes
+---------
+
+- ``config.add_view(<aninstancemethod>)`` raised AttributeError involving
+  ``__text__``.  See https://github.com/Pylons/pyramid/issues/461
+
 1.3b2 (2012-03-02)
 ==================
 
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index f984e46f26..432db79cfd 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -140,15 +140,16 @@ def __call__(self, view):
                                 self.decorated_view(
                                     self.rendered_view(
                                         self.mapped_view(
-                                            self.text_wrapped_view(view))))))))))
+                                            self.text_wrapped_view(
+                                                view))))))))))
+
     @wraps_view
     def text_wrapped_view(self, view):
+        # if the method is an instance method, we need to wrap it in order
+        # to be able to assign a __text__ value to it later.  see #461.
         if inspect.ismethod(view):
-            if hasattr(view, '__text__'):
-                return view
             def text_wrapper(context, request):
                 return view(context, request)
-            text_wrapper.__text__ = ''
             return text_wrapper
         return view
 
diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py
index 13c00c2b63..8877c011e4 100644
--- a/pyramid/tests/test_config/test_views.py
+++ b/pyramid/tests/test_config/test_views.py
@@ -221,10 +221,14 @@ def __call__(self, context, request):
     def test_add_view_as_instancemethod(self):
         from pyramid.renderers import null_renderer
         class View:
-            def index(self, context, request): pass
+            def index(self, context, request):
+                return 'OK'
         view = View()
         config=self._makeOne(autocommit=True)
         config.add_view(view=view.index, renderer=null_renderer)
+        wrapper = self._getViewCallable(config)
+        result = wrapper(None, None)
+        self.assertEqual(result, 'OK')
 
     def test_add_view_as_instance_requestonly(self):
         from pyramid.renderers import null_renderer