Skip to content

Commit e032732

Browse files
authored
Fix: add region tags (#8216)
* Fix: add region tags * Fix: region tag typos * Fix: urlpatterns moved to end * Fix: typo
1 parent 954f83a commit e032732

File tree

9 files changed

+39
-12
lines changed

9 files changed

+39
-12
lines changed

appengine/standard_python3/bundled-services/blobstore/django/main.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class UserPhoto(ndb.Model):
3434
blob_key = ndb.BlobKeyProperty()
3535

3636

37+
# [START gae_blobstore_handler_django]
3738
class PhotoUploadHandler(blobstore.BlobstoreUploadHandler):
3839
def post(self, environ):
3940
upload = self.get_uploads(environ)[0]
@@ -55,6 +56,7 @@ def get(self, environ, photo_key):
5556
# GAE sets it to a guessed type if the header is not set.
5657
response["Content-Type"] = None
5758
return response
59+
# [END gae_blobstore_handler_django]
5860

5961

6062
def upload_form(request):
@@ -84,11 +86,14 @@ def upload_photo(request):
8486
return PhotoUploadHandler().post(request.environ)
8587

8688

89+
# [START gae_blobstore_handler_django]
8790
urlpatterns = (
8891
path("", upload_form, name="upload_form"),
8992
path("view_photo/<key>", view_photo, name="view_photo"),
9093
path("upload_photo", upload_photo, name="upload_photo"),
9194
)
95+
# [END gae_blobstore_handler_django]
96+
9297

9398
settings.configure(
9499
DEBUG=True,

appengine/standard_python3/bundled-services/blobstore/flask/main.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class PhotoUpload(ndb.Model):
2626
blob_key = ndb.BlobKeyProperty()
2727

2828

29+
# [START gae_blobstore_handler_flask]
2930
class PhotoUploadHandler(blobstore.BlobstoreUploadHandler):
3031
def post(self):
3132
upload = self.get_uploads(request.environ)[0]
@@ -48,6 +49,19 @@ def get(self, photo_key):
4849
return "", headers
4950

5051

52+
@app.route("/view_photo/<photo_key>")
53+
def view_photo(photo_key):
54+
"""View photo given a key."""
55+
return ViewPhotoHandler().get(photo_key)
56+
57+
58+
@app.route("/upload_photo", methods=["POST"])
59+
def upload_photo():
60+
"""Upload handler called by blobstore when a blob is uploaded in the test."""
61+
return PhotoUploadHandler().post()
62+
# [END gae_blobstore_handler_flask]
63+
64+
5165
@app.route("/")
5266
def upload():
5367
"""Create the HTML form to upload a file."""
@@ -64,15 +78,3 @@ def upload():
6478
)
6579

6680
return response
67-
68-
69-
@app.route("/view_photo/<photo_key>")
70-
def view_photo(photo_key):
71-
"""View photo given a key."""
72-
return ViewPhotoHandler().get(photo_key)
73-
74-
75-
@app.route("/upload_photo", methods=["POST"])
76-
def upload_photo():
77-
"""Upload handler called by blobstore when a blob is uploaded in the test."""
78-
return PhotoUploadHandler().post()

appengine/standard_python3/bundled-services/blobstore/wsgi/main.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def __call__(self, environ, start_response):
4242
return [response.encode("utf-8")]
4343

4444

45+
# [START gae_blobstore_handler_wsgi]
4546
class UploadPhotoHandler(blobstore.BlobstoreUploadHandler):
4647
"""Upload handler called by blobstore when a blob is uploaded in the test."""
4748

@@ -80,6 +81,7 @@ def get(self, environ):
8081
(r"upload_photo/?$", UploadPhotoHandler),
8182
(r"view_photo/(.+)$", ViewPhotoHandler),
8283
]
84+
# [END gae_blobstore_handler_wsgi]
8385

8486

8587
class Application(object):

appengine/standard_python3/bundled-services/deferred/django/main.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# [START gae_deferred_handler_django]
1516
import os
1617

1718
from django.conf import settings
@@ -79,3 +80,4 @@ def custom_deferred(request):
7980
)
8081

8182
app = wrap_wsgi_app(get_wsgi_application(), use_deferred=True)
83+
# [END gae_deferred_handler_django]

appengine/standard_python3/bundled-services/deferred/flask/main.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# [START gae_deferred_handler_flask]
1516
import os
1617

1718
from flask import Flask, request
@@ -60,3 +61,4 @@ def custom_deferred():
6061
print("Executing deferred task.")
6162
# request.environ contains the WSGI `environ` dictionary (See PEP 0333)
6263
return deferred.Handler().post(request.environ)
64+
# [END gae_deferred_handler_flask]

appengine/standard_python3/bundled-services/deferred/wsgi/main.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# [START gae_deferred_handler_wsgi]
1516
import os
1617
import re
1718

@@ -80,3 +81,4 @@ def __call__(self, environ, start_response):
8081

8182

8283
app = wrap_wsgi_app(WSGIApplication(), use_deferred=True)
84+
# [END gae_deferred_handler_wsgi]

appengine/standard_python3/bundled-services/mail/django/main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ def send_mail(address, body):
6969
return HttpResponse(content=f"Successfully sent mail to {address}.", status=201)
7070

7171

72+
# [START gae_mail_handler_receive_django]
7273
def receive_mail(request):
7374
message = mail.InboundEmailMessage(request.body)
7475

@@ -78,8 +79,10 @@ def receive_mail(request):
7879
break
7980

8081
return HttpResponse("OK")
82+
# [END gae_mail_handler_receive_django]
8183

8284

85+
# [START gae_mail_handler_bounce_django]
8386
def receive_bounce(request):
8487
bounce_message = mail.BounceNotification(dict(request.POST.lists()))
8588

@@ -88,6 +91,7 @@ def receive_bounce(request):
8891
print(f"Bounce notification: {bounce_message.notification}")
8992

9093
return HttpResponse("OK")
94+
# [END gae_mail_handler_bounce_django]
9195

9296

9397
urlpatterns = [

appengine/standard_python3/bundled-services/mail/flask/main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def send_mail():
6767
return f"Successfully sent mail to {address}.", 201
6868

6969

70+
# [START gae_mail_handler_bounce_flask]
7071
@app.route("/_ah/bounce", methods=["POST"])
7172
def receive_bounce():
7273
bounce_message = mail.BounceNotification(dict(request.form.lists()))
@@ -76,8 +77,10 @@ def receive_bounce():
7677
print("Bounce notification: ", bounce_message.notification)
7778

7879
return "OK", 200
80+
# [END gae_mail_handler_bounce_flask]
7981

8082

83+
# [START gae_mail_handler_receive_flask]
8184
@app.route("/_ah/mail/<path>", methods=["POST"])
8285
def receive_mail(path):
8386
message = mail.InboundEmailMessage(request.get_data())
@@ -89,3 +92,4 @@ def receive_mail(path):
8992
break
9093

9194
return "OK", 200
95+
# [END gae_mail_handler_receive_flask]

appengine/standard_python3/bundled-services/mail/wsgi/main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from google.appengine.api import wrap_wsgi_app
2222

2323

24+
# [START gae_mail_handler_receive_wsgi]
2425
def HelloReceiver(environ, start_response):
2526
if environ["REQUEST_METHOD"] != "POST":
2627
return ("", http.HTTPStatus.METHOD_NOT_ALLOWED, [("Allow", "POST")])
@@ -35,8 +36,10 @@ def HelloReceiver(environ, start_response):
3536
response = http.HTTPStatus.OK
3637
start_response(f"{response.value} {response.phrase}", [])
3738
return ["success".encode("utf-8")]
39+
# [END gae_mail_handler_receive_wsgi]
3840

3941

42+
# [START gae_mail_handler_bounce_wsgi]
4043
def BounceReceiver(environ, start_response):
4144
if environ["REQUEST_METHOD"] != "POST":
4245
return ("", http.HTTPStatus.METHOD_NOT_ALLOWED, [("Allow", "POST")])
@@ -51,6 +54,7 @@ def BounceReceiver(environ, start_response):
5154
response = http.HTTPStatus.OK
5255
start_response(f"{response.value} {response.phrase}", [])
5356
return ["success".encode("utf-8")]
57+
# [END gae_mail_handler_bounce_wsgi]
5458

5559

5660
def HomePage(environ, start_response):

0 commit comments

Comments
 (0)