From e33212c6746cbf50c4952b5d8c8d93714cf06ccd Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Mon, 3 Jul 2017 21:06:56 -0700
Subject: Update example apps to use config context manager in Quick Tour - add
 missing EOF line ending

---
 docs/quick_tour/views/app.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'docs/quick_tour/views')

diff --git a/docs/quick_tour/views/app.py b/docs/quick_tour/views/app.py
index e8df6eff2..12d9d25b5 100644
--- a/docs/quick_tour/views/app.py
+++ b/docs/quick_tour/views/app.py
@@ -2,12 +2,12 @@ from wsgiref.simple_server import make_server
 from pyramid.config import Configurator
 
 if __name__ == '__main__':
-    config = Configurator()
-    config.add_route('home', '/')
-    config.add_route('hello', '/howdy')
-    config.add_route('redirect', '/goto')
-    config.add_route('exception', '/problem')
-    config.scan('views')
-    app = config.make_wsgi_app()
+    with Configurator() as config:
+        config.add_route('home', '/')
+        config.add_route('hello', '/howdy')
+        config.add_route('redirect', '/goto')
+        config.add_route('exception', '/problem')
+        config.scan('views')
+        app = config.make_wsgi_app()
     server = make_server('0.0.0.0', 6543, app)
     server.serve_forever()
-- 
cgit v1.2.3


From cae6da810e5b0571a8e5f46da619fa7761ee62b9 Mon Sep 17 00:00:00 2001
From: Jeremy Chen <jeremy886@gmail.com>
Date: Wed, 30 Aug 2017 22:35:18 +1000
Subject: change cgi.escape to pyramid compat.escape

---
 docs/quick_tour/views/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/quick_tour/views')

diff --git a/docs/quick_tour/views/views.py b/docs/quick_tour/views/views.py
index 1449cbb38..9db8ef3c4 100644
--- a/docs/quick_tour/views/views.py
+++ b/docs/quick_tour/views/views.py
@@ -1,4 +1,4 @@
-import cgi
+from pyramid.compat import escape
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.response import Response
@@ -17,7 +17,7 @@ def hello_view(request):
     name = request.params.get('name', 'No Name')
     body = '<p>Hi %s, this <a href="/goto">redirects</a></p>'
     # cgi.escape to prevent Cross-Site Scripting (XSS) [CWE 79]
-    return Response(body % cgi.escape(name))
+    return Response(body % escape(name))
 
 
 # /goto which issues HTTP redirect to the last view
-- 
cgit v1.2.3


From f67d8c770687d5ee82cc21e608c2daf5dbfd50f7 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 22 Sep 2017 23:46:59 -0700
Subject: update comment to align with method

---
 docs/quick_tour/views/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/quick_tour/views')

diff --git a/docs/quick_tour/views/views.py b/docs/quick_tour/views/views.py
index 9db8ef3c4..95a2b60ca 100644
--- a/docs/quick_tour/views/views.py
+++ b/docs/quick_tour/views/views.py
@@ -16,7 +16,7 @@ def home_view(request):
 def hello_view(request):
     name = request.params.get('name', 'No Name')
     body = '<p>Hi %s, this <a href="/goto">redirects</a></p>'
-    # cgi.escape to prevent Cross-Site Scripting (XSS) [CWE 79]
+    # pyramid.compat.escape to prevent Cross-Site Scripting (XSS) [CWE 79]
     return Response(body % escape(name))
 
 
-- 
cgit v1.2.3