Merge lp:~ballot/juju-deployer/LP1892423 into lp:juju-deployer

[Benjamin Allot]

fixes bug: https://launchpad.net/bugs/1892423

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

This doesn't quite work as expected, because on python3 decoding a base64 bytestring returns a bytestring:

base64.b64decode(base64.b64encode(b'HelloWorld').decode()) == b'HelloWorld'

review: Needs Fixing

[Tom Haddon (mthaddon)]

Rejecting since we have another approved MP for this.

Unmerged revisions

223. By Benjamin Allot on 2021-09-14

Attempt to address LP#1892423 and prevent prefixing with "b" upon include-file.

=== modified file 'deployer/deployment.py'
--- deployer/deployment.py	2020-10-16 07:29:31 +0000
+++ deployer/deployment.py	2021-09-14 08:42:20 +0000
@@ -269,7 +269,7 @@
                 v = fh.read()
                 if include_type == "base64":
                     v = b64encode(v)
-                return v
+                return v.decode()
         if feedback:
             return feedback