From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 21 Jul 2015 16:01:52 +0000 (+0300)
Subject: Issue #24669: Fix inspect.getsource() for 'async def' functions.
X-Git-Tag: v3.5.0b4~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4e811d65b51478392a7c69e83b38c6930012eb7;p=thirdparty%2FPython%2Fcpython.git

Issue #24669: Fix inspect.getsource() for 'async def' functions.

Patch by Kai Groner.
---

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 42f24cddba87..4c1ac1f283d0 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -798,7 +798,7 @@ def findsource(object):
         if not hasattr(object, 'co_firstlineno'):
             raise OSError('could not find function definition')
         lnum = object.co_firstlineno - 1
-        pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
+        pat = re.compile(r'^(\s*def\s)|(\s*async\s+def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)')
         while lnum > 0:
             if pat.match(lines[lnum]): break
             lnum = lnum - 1
diff --git a/Lib/test/inspect_fodder.py b/Lib/test/inspect_fodder.py
index 6f0cad942d35..068d8258b925 100644
--- a/Lib/test/inspect_fodder.py
+++ b/Lib/test/inspect_fodder.py
@@ -66,3 +66,6 @@ class FesteringGob(MalodorousPervert, ParrotDroppings):
         pass
     def contradiction(self):
         pass
+
+async def lobbest(grenade):
+    pass
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 8e0e73cf007d..e6208935a7d3 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -336,6 +336,7 @@ class TestRetrievingSourceCode(GetSourceBase):
     def test_getfunctions(self):
         functions = inspect.getmembers(mod, inspect.isfunction)
         self.assertEqual(functions, [('eggs', mod.eggs),
+                                     ('lobbest', mod.lobbest),
                                      ('spam', mod.spam)])
 
     @unittest.skipIf(sys.flags.optimize >= 2,
@@ -393,6 +394,7 @@ class TestRetrievingSourceCode(GetSourceBase):
     def test_getsource(self):
         self.assertSourceEqual(git.abuse, 29, 39)
         self.assertSourceEqual(mod.StupidGit, 21, 50)
+        self.assertSourceEqual(mod.lobbest, 70, 71)
 
     def test_getsourcefile(self):
         self.assertEqual(normcase(inspect.getsourcefile(mod.spam)), modfile)
diff --git a/Misc/NEWS b/Misc/NEWS
index 286f2e2c031e..279cf5c4638c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,9 @@ Library
 - Issue #15014: SMTP.auth() and SMTP.login() now support RFC 4954's optional
   initial-response argument to the SMTP AUTH command.
 
+- Issue #24669: Fix inspect.getsource() for 'async def' functions.
+  Patch by Kai Groner.
+
 
 What's New in Python 3.5.0 beta 3?
 ==================================