Skip to content

Commit 9ff58b2

Browse files
chore(gae): rename regions in guestbook images & memcache (#13048)
* chore(gae): rename regions in images/guestbook/main.py * chore(gae): rename regions in memcache/guestbook/main.py * chore(gae): delete regions 'sign_handler_1' and 'sign_handler_2' in images/guestbook/main.py
1 parent de17d28 commit 9ff58b2

File tree

2 files changed

+22
-36
lines changed

2 files changed

+22
-36
lines changed

appengine/standard/images/guestbook/main.py

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,29 @@
1818
For more information, see README.md.
1919
"""
2020

21-
# [START all]
22-
21+
# [START gae_images_guestbook_all]
2322
import cgi
2423
import urllib
2524

26-
# [START import_images]
25+
# [START gae_images_guestbook_import_images]
2726
from google.appengine.api import images
27+
# [END gae_images_guestbook_import_images]
2828

29-
# [END import_images]
3029
from google.appengine.api import users
3130
from google.appengine.ext import ndb
3231

3332
import webapp2
3433

3534

36-
# [START model]
35+
# [START gae_images_guestbook_model]
3736
class Greeting(ndb.Model):
3837
"""Models a Guestbook entry with an author, content, avatar, and date."""
3938

4039
author = ndb.StringProperty()
4140
content = ndb.TextProperty()
4241
avatar = ndb.BlobProperty()
4342
date = ndb.DateTimeProperty(auto_now_add=True)
44-
45-
46-
# [END model]
43+
# [END gae_images_guestbook_model]
4744

4845

4946
def guestbook_key(guestbook_name=None):
@@ -67,16 +64,16 @@ def get(self):
6764
self.response.out.write("<b>%s</b> wrote:" % greeting.author)
6865
else:
6966
self.response.out.write("An anonymous person wrote:")
70-
# [START display_image]
67+
# [START gae_images_guestbook_display_image]
7168
self.response.out.write(
7269
'<div><img src="/img?img_id=%s"></img>' % greeting.key.urlsafe()
7370
)
7471
self.response.out.write(
7572
"<blockquote>%s</blockquote></div>" % cgi.escape(greeting.content)
7673
)
77-
# [END display_image]
74+
# [END gae_images_guestbook_display_image]
7875

79-
# [START form]
76+
# [START gae_images_guestbook_form]
8077
self.response.out.write(
8178
"""
8279
<form action="/sign?%s"
@@ -99,10 +96,10 @@ def get(self):
9996
cgi.escape(guestbook_name),
10097
)
10198
)
102-
# [END form]
99+
# [END gae_images_guestbook_form]
103100

104101

105-
# [START image_handler]
102+
# [START gae_images_guestbook_image_handler]
106103
class Image(webapp2.RequestHandler):
107104
def get(self):
108105
greeting_key = ndb.Key(urlsafe=self.request.get("img_id"))
@@ -112,12 +109,10 @@ def get(self):
112109
self.response.out.write(greeting.avatar)
113110
else:
114111
self.response.out.write("No image")
112+
# [END gae_images_guestbook_image_handler]
115113

116114

117-
# [END image_handler]
118-
119-
120-
# [START sign_handler]
115+
# [START gae_images_guestbook_sign_handler]
121116
class Guestbook(webapp2.RequestHandler):
122117
def post(self):
123118
guestbook_name = self.request.get("guestbook_name")
@@ -128,24 +123,18 @@ def post(self):
128123

129124
greeting.content = self.request.get("content")
130125

131-
# [START sign_handler_1]
132126
avatar = self.request.get("img")
133-
# [END sign_handler_1]
134-
# [START transform]
127+
# [START gae_images_guestbook_transform]
135128
avatar = images.resize(avatar, 32, 32)
136-
# [END transform]
137-
# [START sign_handler_2]
129+
# [END gae_images_guestbook_transform]
138130
greeting.avatar = avatar
139131
greeting.put()
140-
# [END sign_handler_2]
141132

142133
self.redirect("/?" + urllib.urlencode({"guestbook_name": guestbook_name}))
143-
144-
145-
# [END sign_handler]
134+
# [END gae_images_guestbook_sign_handler]
146135

147136

148137
app = webapp2.WSGIApplication(
149138
[("/", MainPage), ("/img", Image), ("/sign", Guestbook)], debug=True
150139
)
151-
# [END all]
140+
# [END gae_images_guestbook_all]

appengine/standard/memcache/guestbook/main.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
For more information, see README.md.
1919
"""
2020

21-
# [START all]
22-
21+
# [START gae_memcache_guestbook_all]
2322
import cgi
2423
import cStringIO
2524
import logging
@@ -73,7 +72,7 @@ def get(self):
7372
)
7473
)
7574

76-
# [START check_memcache]
75+
# [START gae_memcache_guestbook_check_memcache]
7776
def get_greetings(self, guestbook_name):
7877
"""
7978
get_greetings()
@@ -98,10 +97,9 @@ def get_greetings(self, guestbook_name):
9897
except ValueError:
9998
logging.error("Memcache set failed - data larger than 1MB")
10099
return greetings
100+
# [END gae_memcache_guestbook_check_memcache]
101101

102-
# [END check_memcache]
103-
104-
# [START query_datastore]
102+
# [START gae_memcache_guestbook_query_datastore]
105103
def render_greetings(self, guestbook_name):
106104
"""
107105
render_greetings()
@@ -131,8 +129,7 @@ def render_greetings(self, guestbook_name):
131129
"<blockquote>{}</blockquote>".format(cgi.escape(greeting.content))
132130
)
133131
return output.getvalue()
134-
135-
# [END query_datastore]
132+
# [END gae_memcache_guestbook_query_datastore]
136133

137134

138135
class Guestbook(webapp2.RequestHandler):
@@ -155,4 +152,4 @@ def post(self):
155152

156153
app = webapp2.WSGIApplication([("/", MainPage), ("/sign", Guestbook)], debug=True)
157154

158-
# [END all]
155+
# [END gae_memcache_guestbook_all]

0 commit comments

Comments
 (0)