mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-07 06:59:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

When getting available license seats in Python 3, make sure data passed to FoundationPlist.readPlistFromString is a byte array. Addresses #957.

Browse Source
This commit is contained in:
Greg Neagle
2019-11-03 22:44:08 -08:00
parent 8065ab94c3
commit e20a7c7e63
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/client/munkilib/FoundationPlist.py
View File

@@ -130,7 +130,7 @@ def writePlist(dataObject, filepath):
def writePlistToString(rootObject):
'''Return 'rootObject' as a plist-formatted string.'''
'''Return 'rootObject' as a plist-formatted (byte)string.'''
plistData, error = (
NSPropertyListSerialization.
dataFromPropertyList_format_errorDescription_(

3
code/client/munkilib/updatecheck/licensing.py
View File

@@ -72,7 +72,8 @@ def update_available_license_seats(installinfo):
try:
license_data = fetch.getDataFromURL(url)
display.display_debug1('Got: %s', license_data)
license_dict = FoundationPlist.readPlistFromString(license_data)
license_dict = FoundationPlist.readPlistFromString(
license_data.encode("UTF-8"))
except fetch.Error as err:
# problem fetching from URL
display.display_error('Error from %s: %s', url, err)