From 0c1d8f48adfa131e7fecb0d97c33d3fd12b2064b Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 14 May 2021 15:31:09 -0400 Subject: [PATCH] script/ceph-release-notes: do not encode to bytes This is no longer needed with python3, and adds b'' around strings. Signed-off-by: Josh Durgin --- src/script/ceph-release-notes | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/script/ceph-release-notes b/src/script/ceph-release-notes index 40a4166d2886c..bdeba34cae6fd 100755 --- a/src/script/ceph-release-notes +++ b/src/script/ceph-release-notes @@ -207,7 +207,7 @@ def make_release_notes(gh, repo, ref, plaintext, html, verbose, strict, use_tags match = re.match(title_re, title) if not match: print ("ERROR: https://github.com/ceph/ceph/pull/" + - str(number) + " title " + title.encode("utf-8") + + str(number) + " title " + title + " does not match " + title_re) else: title = match.group(1) + match.group(2) @@ -258,9 +258,9 @@ def make_release_notes(gh, repo, ref, plaintext, html, verbose, strict, use_tags issues = '' if plaintext: print ("* {title} ({issues}{author})".format( - title=title.encode("utf-8"), + title=title, issues=issues, - author=author.encode("utf-8") + author=author ) ) elif html: @@ -270,9 +270,9 @@ def make_release_notes(gh, repo, ref, plaintext, html, verbose, strict, use_tags "https://github.com/ceph/ceph/pull/{pr}\"" ">pr#{pr}, {author})

" ).format( - title=title.encode("utf-8"), + title=title, issues=issues, - author=author.encode("utf-8"), pr=pr + author=author, pr=pr ) ) else: @@ -282,9 +282,9 @@ def make_release_notes(gh, repo, ref, plaintext, html, verbose, strict, use_tags "https://github.com/ceph/ceph/pull/{pr}" ">`_, {author})" ).format( - title=title.encode("utf-8"), + title=title, issues=issues, - author=author.encode("utf-8"), pr=pr + author=author, pr=pr ) ) if message: -- 2.39.5