mod19 fixes to support Py2

Author: wescpy

mod19-pubsub/app.yaml

@@ -12,4 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-runtime: python310
+#runtime: python310
+runtime: python27
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: /.*
+ script: main.app
+
+libraries:
+- name: setuptools
+ version: latest
+- name: grpcio
+ version: latest

mod19-pubsub/app3.yaml

@@ -0,0 +1,15 @@
+# Copyright 2022 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.
+
+runtime: python310

mod19-pubsub/appengine_config.py

@@ -0,0 +1,23 @@
+# Copyright 2021 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.
+
+import pkg_resources
+from google.appengine.ext import vendor
+
+# Set PATH to your libraries folder.
+PATH = 'lib'
+# Add libraries installed in the PATH folder.
+vendor.add(PATH)
+# Add libraries to pkg_resources working set to find the distribution.
+pkg_resources.working_set.add_entry(PATH)

mod19-pubsub/main.py

@@ -63,15 +63,20 @@ def log_visitors():
  # tally recent visitor counts from queue then delete those tasks
  tallies = {}
  acks = set()
- with psc_client:
- rsp = psc_client.pull(subscription=SUB_PATH, max_messages=TASKS)
- msgs = rsp.received_messages
- for rcvd_msg in msgs:
- acks.add(rcvd_msg.ack_id)
- visitor = rcvd_msg.message.data.decode('utf-8')
- tallies[visitor] = tallies.get(visitor, 0) + 1
- if acks:
- psc_client.acknowledge(subscription=SUB_PATH, ack_ids=acks)
+ #with psc_client:
+ rsp = psc_client.pull(subscription=SUB_PATH, max_messages=TASKS)
+ msgs = rsp.received_messages
+ for rcvd_msg in msgs:
+ acks.add(rcvd_msg.ack_id)
+ visitor = rcvd_msg.message.data.decode('utf-8')
+ tallies[visitor] = tallies.get(visitor, 0) + 1
+ if acks:
+ psc_client.acknowledge(subscription=SUB_PATH, ack_ids=acks)
+ if hasattr(psc_client, 'close'):
+ try:
+ psc_client.close()
+ except AttributeError:
+ pass
 
  # increment those counts in Datastore and return
  if tallies: