2017-02-27 12:56:24 +01:00
|
|
|
Index: cloudinit/util.py
|
|
|
|
|
===================================================================
|
2016-09-15 18:41:25 +02:00
|
|
|
--- cloudinit/util.py.orig
|
|
|
|
|
+++ cloudinit/util.py
|
2017-02-27 12:56:24 +01:00
|
|
|
@@ -155,7 +155,7 @@ def target_path(target, path=None):
|
2016-09-15 18:41:25 +02:00
|
|
|
|
|
|
|
|
def decode_binary(blob, encoding='utf-8'):
|
|
|
|
|
# Converts a binary type into a text type using given encoding.
|
|
|
|
|
- if isinstance(blob, six.text_type):
|
|
|
|
|
+ if isinstance(blob, six.string_types):
|
|
|
|
|
return blob
|
|
|
|
|
return blob.decode(encoding)
|
|
|
|
|
|
