From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 21 Jul 2015 16:04:22 +0000 (+0300)
Subject: Merge 3.5 (Issue #24669)
X-Git-Tag: v3.6.0a1~1942
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d603f179682baee02684af6eff2f0d8cff6ad9c;p=python

Merge 3.5 (Issue #24669)
---

8d603f179682baee02684af6eff2f0d8cff6ad9c
diff --cc Misc/NEWS
index 960798ee24,279cf5c463..bd2e07e534
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -61,10 -45,10 +61,12 @@@ Librar
  - Issue #15014: SMTP.auth() and SMTP.login() now support RFC 4954's optional
    initial-response argument to the SMTP AUTH command.
  
 +- Issue #6549: Remove hyphen from ttk.Style().element options.  Only return result
 +  from ttk.Style().configure if a result was generated or a query submitted.
 +
+ - Issue #24669: Fix inspect.getsource() for 'async def' functions.
+   Patch by Kai Groner.
  
 -
  What's New in Python 3.5.0 beta 3?
  ==================================