Return decorators too for bpo-15856

Author: tirkarthi

Lib/inspect.py

@@ -821,8 +821,14 @@ def visit_ClassDef(self, node):
                 nonlocal line_number
                 stack.append(node.name)
                 if qualname == '.'.join(stack):
+                    # Return the decorator for the class if present
+                    if node.decorator_list:
+                        line_number = node.decorator_list[0].lineno
+                    else:
+                        line_number = node.lineno
+
                     # decrement by one since lines starts with indexing by zero
-                    line_number = node.lineno - 1
+                    line_number -= 1
                     raise StopIteration(line_number)
                 self.generic_visit(node)
                 stack.pop()

Lib/test/test_inspect.py

@@ -724,8 +724,8 @@ def test_nested_class_definition(self):
         self.assertSourceEqual(mod2.cls183.cls185, 185, 188)
 
     def test_class_decorator(self):
-        self.assertSourceEqual(mod2.cls196, 196, 201)
-        self.assertSourceEqual(mod2.cls196.cls200, 200, 201)
+        self.assertSourceEqual(mod2.cls196, 194, 201)
+        self.assertSourceEqual(mod2.cls196.cls200, 198, 201)
 
     def test_class_inside_conditional(self):
         self.assertSourceEqual(mod2.cls238, 238, 240)

Misc/NEWS.d/next/Library/2018-11-03-16-18-20.bpo-35113.vwvWKG.rst

@@ -1,2 +1,3 @@
 :meth:`inspect.getsource` now returns correct source code for inner class
-with same name as module level class. Patch by Karthikeyan Singaravelan.
+with same name as module level class. Decorators are also returned as part
+of source of the class. Patch by Karthikeyan Singaravelan.