requests samples work in 2.7 and 3.7 (gcloud deploy app app3.yaml for the Python 3.7 version)

engelke · engelke · commit 77355aea172b · 2020-02-13T14:30:21.000-08:00
diff --git a/appengine/standard/migration/urlfetch/requests/app.yaml b/appengine/standard/migration/urlfetch/requests/app.yaml
@@ -0,0 +1,7 @@
+runtime: python27
+api_version: 1
+threadsafe: yes
+
+handlers:
+- url: .*
+  script: main.app
diff --git a/appengine/standard/migration/urlfetch/requests/app3.yaml b/appengine/standard/migration/urlfetch/requests/app3.yaml
@@ -0,0 +1 @@
+runtime: python37
diff --git a/appengine/standard/migration/urlfetch/requests/appengine_config.py b/appengine/standard/migration/urlfetch/requests/appengine_config.py
@@ -0,0 +1,25 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from google.appengine.ext import vendor
+
+# Add any libraries installed in the "lib" folder.
+vendor.add('lib')
+
+import requests
+import requests_toolbelt.adapters.appengine
+
+# Use the App Engine Requests adapter. This makes sure that Requests uses
+# URLFetch.
+requests_toolbelt.adapters.appengine.monkeypatch()
diff --git a/appengine/standard/migration/urlfetch/requests/main.py b/appengine/standard/migration/urlfetch/requests/main.py
@@ -0,0 +1,44 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# [START app]
+import logging
+
+from flask import Flask
+
+# [START imports]
+import requests
+# [END imports]
+
+app = Flask(__name__)
+
+
+@app.route('/')
+def index():
+    # [START requests_get]
+    url = 'http://www.google.com/humans.txt'
+    response = requests.get(url)
+    response.raise_for_status()
+    return response.text
+    # [END requests_get]
+
+
+@app.errorhandler(500)
+def server_error(e):
+    logging.exception('An error occurred during a request.')
+    return """
+    An internal error occurred: <pre>{}</pre>
+    See logs for full stacktrace.
+    """.format(e), 500
+# [END app]
diff --git a/appengine/standard/migration/urlfetch/requests/requirements.txt b/appengine/standard/migration/urlfetch/requests/requirements.txt
@@ -0,0 +1,3 @@
+Flask==1.1.1
+requests==2.22.0
+requests-toolbelt==0.9.1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Flask==1.1.1`
	`2`	`+requests==2.22.0`
	`3`	`+requests-toolbelt==0.9.1`