From 07f93e8731db8095bf1de38aa830619ba0632973 Mon Sep 17 00:00:00 2001 From: Jonathan Munoz Gomez Date: Thu, 5 Oct 2017 09:33:15 -0500 Subject: [PATCH 1/9] Improving string cast for log --- app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.py b/app.py index d79f2f1d..c2301a57 100644 --- a/app.py +++ b/app.py @@ -78,7 +78,7 @@ def send_message(recipient_id, message_text): def log(message): # simple wrapper for logging to stdout on heroku - print str(message) + print message.encode('utf-8').strip() sys.stdout.flush() From e0029a7efb9445271d39e7d52f2f8f442eef886b Mon Sep 17 00:00:00 2001 From: Hartley Brody Date: Sat, 7 Oct 2017 13:57:40 +0000 Subject: [PATCH 2/9] should have tested the logging funtion before merging that PR. copy known good code from another project --- app.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index c2301a57..8eede5a2 100644 --- a/app.py +++ b/app.py @@ -77,8 +77,12 @@ def send_message(recipient_id, message_text): log(r.text) -def log(message): # simple wrapper for logging to stdout on heroku - print message.encode('utf-8').strip() +def log(msg, *args, **kwargs): # simple wrapper for logging to stdout on heroku + try: + msg = unicode(msg).format(*args, **kwargs) + print u"{}: {}".format(datetime.now(), msg) + except UnicodeEncodeError: + pass # squash logging errors in case of non-ascii text sys.stdout.flush() From 3007ad96d123c7512ac535b4d02be87c8fd53a7b Mon Sep 17 00:00:00 2001 From: Hartley Brody Date: Thu, 12 Oct 2017 13:09:23 +0200 Subject: [PATCH 3/9] let's actually test this logging to make sure it works for all data types --- app.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index 8eede5a2..b33eebf5 100644 --- a/app.py +++ b/app.py @@ -1,6 +1,7 @@ import os import sys import json +from datetime import datetime import requests from flask import Flask, request @@ -79,7 +80,10 @@ def send_message(recipient_id, message_text): def log(msg, *args, **kwargs): # simple wrapper for logging to stdout on heroku try: - msg = unicode(msg).format(*args, **kwargs) + if type(msg) is dict: + msg = json.dumps(msg) + else: + msg = unicode(msg).format(*args, **kwargs) print u"{}: {}".format(datetime.now(), msg) except UnicodeEncodeError: pass # squash logging errors in case of non-ascii text From 541c129e4b747755c42a2e47c89e37f496493b58 Mon Sep 17 00:00:00 2001 From: Hartley Brody Date: Sat, 14 Oct 2017 11:20:55 +0200 Subject: [PATCH 4/9] bump the runtime version for heroku --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index ba85ab97..2ce112e3 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-2.7.13 \ No newline at end of file +python-2.7.14 \ No newline at end of file From 1a86c8b5041960d814c0a86350b4715eb5a566f9 Mon Sep 17 00:00:00 2001 From: Ihor Udod <53335388+udodihor@users.noreply.github.com> Date: Sat, 28 Dec 2019 18:00:43 +0100 Subject: [PATCH 5/9] line 87: missing parentheses print doesn't work without this fix (at least on Python 3.7) --- app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.py b/app.py index b33eebf5..b9a2bea9 100644 --- a/app.py +++ b/app.py @@ -84,7 +84,7 @@ def log(msg, *args, **kwargs): # simple wrapper for logging to stdout on heroku msg = json.dumps(msg) else: msg = unicode(msg).format(*args, **kwargs) - print u"{}: {}".format(datetime.now(), msg) + print("{}: {}".format(datetime.now(), msg)) except UnicodeEncodeError: pass # squash logging errors in case of non-ascii text sys.stdout.flush() From ba9170464f7c29c9ff2ed99199e23b7f7e2d6707 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 22:16:51 +0000 Subject: [PATCH 6/9] Bump jinja2 from 2.8 to 2.11.3 Bumps [jinja2](https://github.com/pallets/jinja) from 2.8 to 2.11.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/2.8...2.11.3) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fe15f173..cb5aef49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Flask==0.11.1 -Jinja2==2.8 +Jinja2==2.11.3 MarkupSafe==0.23 Werkzeug==0.11.10 click==6.6 From 6c0a9c0173da413b53bfc1f96eecf2566f981501 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 14:07:36 +0000 Subject: [PATCH 7/9] Bump requests from 2.10.0 to 2.20.0 Bumps [requests](https://github.com/psf/requests) from 2.10.0 to 2.20.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.10.0...v2.20.0) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cb5aef49..bc81bf03 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ Werkzeug==0.11.10 click==6.6 gunicorn==19.6.0 itsdangerous==0.24 -requests==2.10.0 +requests==2.20.0 wsgiref==0.1.2 From 756c943f75734fe71f0fae9c8efee1a7fe67de91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 14:08:04 +0000 Subject: [PATCH 8/9] Bump werkzeug from 0.11.10 to 0.15.3 Bumps [werkzeug](https://github.com/pallets/werkzeug) from 0.11.10 to 0.15.3. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/master/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/0.11.10...0.15.3) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cb5aef49..e8053dc0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Flask==0.11.1 Jinja2==2.11.3 MarkupSafe==0.23 -Werkzeug==0.11.10 +Werkzeug==0.15.3 click==6.6 gunicorn==19.6.0 itsdangerous==0.24 From a322c7e946fa1d0b3aad966d650fc58e229ebed5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 14:36:26 +0000 Subject: [PATCH 9/9] Bump flask from 0.11.1 to 1.0 Bumps [flask](https://github.com/pallets/flask) from 0.11.1 to 1.0. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/master/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/0.11.1...1.0) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2fb7b104..34da0218 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Flask==0.11.1 +Flask==1.0 Jinja2==2.11.3 MarkupSafe==0.23 Werkzeug==0.15.3