From 4753881223e0ff5e3b3be35bb687a18dfec4f672 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 7 Nov 2017 09:30:13 -0800
Subject: Rename an internal-only 'async' method kwarg for Python 3.7
 compatibility.

Fixes #1108
---
 paramiko/sftp_file.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/paramiko/sftp_file.py b/paramiko/sftp_file.py
index 028d894a..bc34db94 100644
--- a/paramiko/sftp_file.py
+++ b/paramiko/sftp_file.py
@@ -65,15 +65,15 @@ class SFTPFile (BufferedFile):
         self._reqs = deque()
 
     def __del__(self):
-        self._close(async=True)
+        self._close(async_=True)
 
     def close(self):
         """
         Close the file.
         """
-        self._close(async=False)
+        self._close(async_=False)
 
-    def _close(self, async=False):
+    def _close(self, async_=False):
         # We allow double-close without signaling an error, because real
         # Python file objects do.  However, we must protect against actually
         # sending multiple CMD_CLOSE packets, because after we close our
@@ -88,7 +88,7 @@ class SFTPFile (BufferedFile):
             self.sftp._finish_responses(self)
         BufferedFile.close(self)
         try:
-            if async:
+            if async_:
                 # GC'd file handle could be called from an arbitrary thread
                 # -- don't wait for a response
                 self.sftp._async_request(type(None), CMD_CLOSE, self.handle)
-- 
cgit v1.2.3


From b85c34559b601199262d654578bb2868f648d159 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Tue, 7 Nov 2017 09:34:15 -0800
Subject: Changelog re #1108

[ci skip]
---
 sites/www/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index e1cb0d2c..af1123c0 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :bug:`1108 (1.17+)` Rename a private method keyword argument (which was named
+  ``async``) so that we're compatible with the upcoming Python 3.7 release
+  (where ``async`` is a new keyword.) Thanks to ``@vEpiphyte`` for the report.
 * :support:`- backported` Include LICENSE file in wheel archives.
 * :release:`2.0.7 <2017-09-18>`
 * :release:`1.18.4 <2017-09-18>`
-- 
cgit v1.2.3