2 files changed, 14 insertions, 11 deletions
diff --git a/docs/quick_tutorial/package/setup.py b/docs/quick_tutorial/package/setup.py
index bcfcfa684..910c552ad 100644
--- a/docs/quick_tutorial/package/setup.py
+++ b/docs/quick_tutorial/package/setup.py
@@ -1,9 +1,13 @@
 from setuptools import setup
 
+# List of dependencies installed via `pip install -e .`
+# by virtue of the Setuptools `install_requires` value below.
 requires = [
     'pyramid',
+    'waitress',
 ]
 
-setup(name='tutorial',
-      install_requires=requires,
-)
-\ No newline at end of file
+setup(
+    name='tutorial',
+    install_requires=requires,
+)
diff --git a/docs/quick_tutorial/package/tutorial/app.py b/docs/quick_tutorial/package/tutorial/app.py
index 210075023..ff0b950d3 100644
--- a/docs/quick_tutorial/package/tutorial/app.py
+++ b/docs/quick_tutorial/package/tutorial/app.py
@@ -1,17 +1,16 @@
-from wsgiref.simple_server import make_server
+from waitress import serve
 from pyramid.config import Configurator
 from pyramid.response import Response
 
 
 def hello_world(request):
-    print ('Incoming request')
+    print('Incoming request')
     return Response('<body><h1>Hello World!</h1></body>')
 
 
 if __name__ == '__main__':
-    config = Configurator()
-    config.add_route('hello', '/')
-    config.add_view(hello_world, route_name='hello')
-    app = config.make_wsgi_app()
-    server = make_server('0.0.0.0', 6543, app)
-    server.serve_forever()
-\ No newline at end of file
+    with Configurator() as config:
+        config.add_route('hello', '/')
+        config.add_view(hello_world, route_name='hello')
+        app = config.make_wsgi_app()
+    serve(app, host='0.0.0.0', port=6543)