minor Mod22 tweaks

Author: wescpy

README.md

@@ -76,7 +76,7 @@ Topic | Module ordering | Description
 --- | --- | ---
 Baseline | 0 ⇒ 1 | Not a migration but a description of the baseline application (review this material before doing any migrations)
 Web framework | 1 ⇒ _everything else_ | Current App Engine runtimes do not come with a web framework, so this must be the first migration performed. All migrations below can be performed after this one.
-Bundled services | 17 | This module is for Python bundled services users interested in how to access those services from Python 3.
+Bundled services | 17 ⇒ 22 | These modules are for those who want to continue using Python bundled services from Python 3 App Engine.
 Datastore | 2 [⇒ 3 [⇒ 6]] | Moving off App Engine `ndb` makes your apps more portable, so the **Module 2** Cloud NDB migration is _recommended_. **Module 3:** Migrating to Cloud Datastore (Firestore in Datastore mode) is _optional_ and only recommended if you have other code using Cloud Datastore. **Module 6**: Migrating to Cloud Firestore (Native mode) is generally _not recommended_ unless you must have the Firebase features it has, and those features will eventually be integrated into Cloud Datastore.
 (Push) Task Queues | [7 ⇒] 8 [⇒ 9] | Moving off App Engine `taskqueue` makes your apps more portable, so the **Module 8** Cloud Tasks migration is _recommended_ for those using push tasks. Those unfamiliar with push tasks should do **Module 7** first to add push tasks to the sample app. **Module 9:** Migrating to Cloud Datastore (Firestore in Datastore mode), Cloud Tasks (v2), and Python 3 is _optional_ and only recommended if you have other code using Cloud Datastore and considering upgrading to Python 3.
 (Pull) Task Queues | [18 ⇒] 19 | Moving off App Engine `taskqueue` makes your apps more portable, so the **Module 19** Cloud Pub/Sub migration is _recommended_ for those using pull tasks. The app is also ported to Python 3. Those unfamiliar with pull tasks should do **Module 18** first to add pull tasks to the sample app.
@@ -119,7 +119,7 @@ Module | Topic | Video | Codelab | START here | FINISH here
 19|Migrate to Cloud Pub/Sub| _TBD_ | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-19-pubsub?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrpubsub_sms_202016&utm_content=-) | Module 18 [code](/mod18-gaepull) (2.x) | Module 19 [code](/mod19-pubsub) (2.x & 3.x)
 20|Add App Engine `users` | _TBD_ | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-20-gaeusers?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgrgaeusers_sms_202119&utm_content=-)| Module 1 [code](/mod1-flask) (2.x) | Module 20 [code](/mod20-gaeusers) (2.x)
 21|Migrate to Cloud Identity Platform | _TBD_ | [link](https://codelabs.developers.google.com/codelabs/cloud-gae-python-migrate-21-idenplat?utm_source=codelabs&utm_medium=et&utm_campaign=CDR_wes_aap-serverless_mgridenplat_sms_202119&utm_content=-)| Module 20 [code](/mod20-gaeusers) (2.x) |  Module 21 [code](/mod21a-idenplat) (2.x) & [code](/mod21b-idenplat) (3.x)
-22|Migrate to Python 3 bundled services (Part 2)| _TBD_ | _N/A_ | Module 22  [code](/mod22-bundled) (2.x & 3.x) | _(same)_
+22|Migrate to Python 3 bundled services (Part 2)| _TBD_ | _N/A_ | Module 22  [code](/mod22-bundled) (2.x & 3.x) | _(⇐ same folder)_
 
 
 ### Table of contents

mod22-bundled/README.md

@@ -2,7 +2,7 @@
 
 There are six folders in this directory that contain full applications using the Blobstore, Deferred, and Mail bundled services. A Python 2 version using the `webapp2` framework is provided along with a modernized Python 3 equivalent using the Flask web framework and the Python 3 App Engine SDK.
 
-Bundled service | Python 2 `webapp` | Python 3 Flask
+Bundled service | Python 2 `webapp2` | Python 3 Flask
 --- | --- | ---
 Blobstore | [code](blobstore2) | [code](blobstore3)
 Deferred | [code](deferred2) | [code](deferred3)

mod22-bundled/blobstore2/main.py

@@ -17,6 +17,7 @@
 from google.appengine.ext.webapp import blobstore_handlers
 
 UPLOAD_FORM = '''\
+<title>Module 22 Blobstore sample app</title>
 <h2>Upload photo:</h2>
 <form action="%s" method="POST" enctype="multipart/form-data">
     <input type="file" name="file"><p></p><input type="submit">

mod22-bundled/blobstore3/main.py

@@ -17,6 +17,7 @@
 from google.appengine.ext import blobstore, ndb
 
 UPLOAD_FORM = '''\
+<title>Module 22 Blobstore sample app</title>
 <h2>Upload photo:</h2>
 <form action="%s" method="POST" enctype="multipart/form-data">
     <input type="file" name="file"><p></p><input type="submit">

mod22-bundled/deferred2/main.py

@@ -16,6 +16,10 @@
 from google.appengine.ext import deferred, ndb
 
 KEY_NAME = 'SECRET'
+OUTPUT = '''\
+<title>Module 22 Deferred sample app</title>
+Counter at %d... bump requested.
+'''
 
 class Counter(ndb.Model):
     'Counter entity: autoincrement integer'
@@ -33,8 +37,7 @@ class MainHandler(webapp2.RequestHandler):
     def get(self):
         'main application (GET) handler'
         entity = Counter.get_by_id(KEY_NAME)
-        self.response.write('Counter at %d... bump requested.' % (
-                entity.count if entity else 0))
+        self.response.write(OUTPUT % (entity.count if entity else 0))
         deferred.defer(bump_counter_later, KEY_NAME)
 
 

mod22-bundled/deferred3/main.py

@@ -17,6 +17,10 @@
 from google.appengine.ext import deferred, ndb
 
 KEY_NAME = 'SECRET'
+OUTPUT = '''\
+<title>Module 22 Deferred sample app</title>
+Counter at %d... bump requested.
+'''
 app = Flask(__name__)
 app.wsgi_app = wrap_wsgi_app(app.wsgi_app, use_deferred=True)
 
@@ -36,7 +40,6 @@ def bump_counter_later(key):
 def root():
     'main application (GET) handler'
     entity = Counter.get_by_id(KEY_NAME)
-    output = 'Counter at %d... bump requested.' % (
-            entity.count if entity else 0)
+    output = OUTPUT % (entity.count if entity else 0)
     deferred.defer(bump_counter_later, KEY_NAME)
     return output

mod22-bundled/mail2/main.py

@@ -20,6 +20,7 @@
 KEY_NAME = 'SECRET'
 FIELDS = frozenset(('sender', 'subject', 'date'))
 MSG_TMPL = '''\
+<title>Module 22 Mail sample app</title>
 <h2>Last message received:</h2><p></p>
 <pre>
 From: %(sender)s
@@ -66,8 +67,8 @@ class MainHandler(webapp2.RequestHandler):
     def get(self):
         last_msg = LastMsg.get_by_id(KEY_NAME)
         msg_dict = last_msg.to_dict()
-        self.response.write(
-                MSG_TMPL % dict((k, escape(msg_dict[k])) for k in msg_dict))
+        self.response.write(MSG_TMPL %
+                dict((k, escape(msg_dict[k])) for k in msg_dict))
 
 
 app = webapp2.WSGIApplication([

mod22-bundled/mail3/main.py

@@ -20,6 +20,7 @@
 KEY_NAME = 'SECRET'
 FIELDS = frozenset(('sender', 'subject', 'date'))
 MSG_TMPL = '''\
+<title>Module 22 Mail sample app</title>
 <h2>Last message received:</h2><p></p>
 <pre>
 From: %(sender)s