Fix code and test

Lib/pydoc.py

@@ -1775,9 +1775,8 @@ def doc(thing, title='Python Library Documentation: %s', forceload=0,
         output=None, follow_wrapped=True):
     """Display text documentation, given an object or a path to an object."""
     try:
-        if follow_wrapped:
-            thing = inspect.unwrap(thing,
-                                   stop=(lambda func: not getattr(func, '__doc__', True)))
+        if not follow_wrapped:
+            thing = type(thing)
         if output is None:
             pager(render_doc(thing, title, forceload))
         else:

Lib/test/test_pydoc.py

@@ -647,7 +647,7 @@ def test_builtin_on_metaclasses(self):
         # Testing that the subclasses section does not appear
         self.assertNotIn('Built-in subclasses', text)
 
-    def test_builtin_with_wrapper(self):
+    def test_help_with_wrapper(self):
         """Test help on function wrapped.
 
         When running help() on a function that is wrapped,
@@ -659,7 +659,7 @@ def test_builtin_with_wrapper(self):
         class TestWrapper:
             """This is the docstring of Wrapper"""
             def __init__(self, func):
-                functools.update_wrapper(func)
+                functools.update_wrapper(self, func)
             def __call__(self):
                 pass
 
@@ -668,19 +668,22 @@ def test_func1():
             """Test func1"""
             pass
 
-        doc = pydoc.TextDoc()
-        text = doc.docclass(test_func1)
-        self.assertIn('Test func1', text)
+        buff = StringIO()
+
+        helper = pydoc.Helper(output=buff)
+
+        helper.help(test_func1)
+        self.assertIn('Test func1', buff.getvalue().strip())
 
-        text = doc.docclass(test_func1, follow_wrapped=False)
-        self.assertIn("This is the docstring for Wrapper", text)
+        helper.help(test_func1, follow_wrapped=False)
+        self.assertIn("This is the docstring of Wrapper", buff.getvalue().strip())
 
         @TestWrapper
         def test_func2():
             pass
 
-        text = doc.docclass(test_func1)
-        self.assertIn("This is the docstring for wrapper", text)
+        helper.help(test_func2)
+        self.assertIn("This is the docstring of Wrapper", buff.getvalue().strip())
 
     @unittest.skipIf(sys.flags.optimize >= 2,
                      'Docstrings are omitted with -O2 and above')