From: Pierce Lopez <pierce.lopez@gmail.com>
Date: Fri, 8 Sep 2017 21:49:55 +0000 (-0400)
Subject: file_upload demo: yield write() cb in body_producer
X-Git-Tag: v5.0.0~57^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab42d83714b5d1f0e2d29e03e9344c9ab48dfc24;p=thirdparty%2Ftornado.git

file_upload demo: yield write() cb in body_producer
---

diff --git a/demos/file_upload/file_uploader.py b/demos/file_upload/file_uploader.py
index 5f13fcb61..f4af78c5f 100644
--- a/demos/file_upload/file_uploader.py
+++ b/demos/file_upload/file_uploader.py
@@ -34,28 +34,24 @@ def multipart_producer(boundary, filenames, write):
 
     for filename in filenames:
         filename_bytes = filename.encode()
-        write(b'--%s\r\n' % (boundary_bytes,))
-        write(b'Content-Disposition: form-data; name="%s"; filename="%s"\r\n' %
-              (filename_bytes, filename_bytes))
+        yield write(b'--%s\r\n' % (boundary_bytes,))
+        yield write(b'Content-Disposition: form-data; name="%s"; filename="%s"\r\n' %
+                    (filename_bytes, filename_bytes))
 
         mtype = mimetypes.guess_type(filename)[0] or 'application/octet-stream'
-        write(b'Content-Type: %s\r\n' % (mtype.encode(),))
-        write(b'\r\n')
+        yield write(b'Content-Type: %s\r\n' % (mtype.encode(),))
+        yield write(b'\r\n')
         with open(filename, 'rb') as f:
             while True:
                 # 16k at a time.
                 chunk = f.read(16 * 1024)
                 if not chunk:
                     break
-                write(chunk)
+                yield write(chunk)
 
-                # Let the IOLoop process its event queue.
-                yield gen.moment
+        yield write(b'\r\n')
 
-        write(b'\r\n')
-        yield gen.moment
-
-    write(b'--%s--\r\n' % (boundary_bytes,))
+    yield write(b'--%s--\r\n' % (boundary_bytes,))
 
 
 # Using HTTP PUT, upload one raw file. This is preferred for large files since
@@ -84,7 +80,7 @@ def raw_producer(filename, write):
                 # Complete.
                 break
 
-            write(chunk)
+            yield write(chunk)
 
 
 @gen.coroutine