[allura] branch master updated: changelog.py py3 text/binary fixes

[brondsem]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/master by this push:
     new 9a5898e  changelog.py py3 text/binary fixes
9a5898e is described below

commit 9a5898e8cff998630d0f6cb4f8efc1224b5570a3
Author: Dave Brondsema <dbronds...@slashdotmedia.com>
AuthorDate: Wed May 12 13:17:52 2021 -0400

    changelog.py py3 text/binary fixes
---
 scripts/changelog.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/changelog.py b/scripts/changelog.py
index cb1fa2f..87c4c07 100755
--- a/scripts/changelog.py
+++ b/scripts/changelog.py
@@ -26,6 +26,7 @@ import git
 import requests
 from datetime import datetime
 
+import six
 
 CHANGELOG = 'CHANGES'
 API_URL = 
'https://forge-allura.apache.org/rest/p/allura/tickets/search?limit=1000&q=ticket_num:({0})'
@@ -72,9 +73,9 @@ def print_changelog(version, summaries, 
changes_without_tickets):
         'date': datetime.utcnow().strftime('%B %Y'),
     }))
     for ticket in sorted(summaries.keys()):
-        print(" * [#{0}] {1}".format(ticket, 
summaries[ticket].encode('utf-8')))
+        print(" * [#{0}] {1}".format(ticket, 
six.ensure_text(summaries[ticket])))
     for change in changes_without_tickets:
-        print(" * {}".format(change.encode('utf-8')))
+        print(" * {}".format(six.ensure_text(change)))
 
 if __name__ == '__main__':
     main()