fix: Workaround for bug in functools.update_wrapper() (fixes #223 #224)

Thanks to Brian Wickman

2 files changed, 15 insertions, 1 deletions

diff --git a/bottle.py b/bottle.py
index 969d513..1ee88b2 100755
--- a/bottle.py
+++ b/bottle.py
@@ -123,6 +123,10 @@ def tob(data, enc='utf8'):
 tonat = touni if py3k else tob
 tonat.__doc__ = """ Convert anything to native strings """
 
+def try_update_wrapper(wrapper, wrapped, *a, **ka):
+    try: # Bug: functools breaks if wrapper is an instane method
+        functools.update_wrapper(wrapper, wrapped, *a, **ka)
+    except AttributeError: pass
 
 # Backward compatibility
 def depr(message):
@@ -508,7 +512,8 @@ class Route(object):
                     callback = plugin(callback)
             except RouteReset: # Try again with changed configuration.
                 return self._make_callback()
-            functools.update_wrapper(callback, self.callback)
+            if not callback is self.callback:
+                try_update_wrapper(callback, self.callback)
         return callback
 
 
diff --git a/test/test_plugins.py b/test/test_plugins.py
index b16ae43..c6d190d 100644
--- a/test/test_plugins.py
+++ b/test/test_plugins.py
@@ -182,6 +182,15 @@ class TestPluginAPI(tools.ServerTestBase):
         self.app.install(Plugin())
         self.assertBody('test:plugin.cfg; tail', '/')
 
+    def test_instance_method_wrapper(self):
+        class Plugin(object):
+            api=2
+            def apply(self, callback, route):
+                return self.b
+            def b(self): return "Hello"
+        self.app.install(Plugin())
+        self.assertBody('Hello', '/')
+
     def test_setup(self):
         class Plugin(object):
             def __call__(self, func): return func