mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 21:40:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Explictly check that item returned from NSPropertyListSerialization methods is None to distinquish that from perfectly-valid empty objects (empty arrays, dicts, etc)

Browse Source
This commit is contained in:
Greg Neagle
2015-04-22 11:44:23 -07:00
parent 3748463791
commit 248368ba3a
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/FoundationPlist.py
+20 -8
View File
@@ -76,8 +76,11 @@ def readPlist(filepath):
NSPropertyListSerialization.
propertyListFromData_mutabilityOption_format_errorDescription_(
plistData, NSPropertyListMutableContainers, None, None))
if not dataObject:
error = error.encode('ascii', 'ignore')
if dataObject is None:
if error:
error = error.encode('ascii', 'ignore')
else:
error = "Unknown error"
errmsg = "%s in file %s" % (error, filepath)
raise NSPropertyListSerializationException(errmsg)
else:
@@ -94,8 +97,11 @@ def readPlistFromString(data):
NSPropertyListSerialization.
propertyListFromData_mutabilityOption_format_errorDescription_(
plistData, NSPropertyListMutableContainers, None, None))
if not dataObject:
error = error.encode('ascii', 'ignore')
if dataObject is None:
if error:
error = error.encode('ascii', 'ignore')
else:
error = "Unknown error"
raise NSPropertyListSerializationException(error)
else:
return dataObject
@@ -109,8 +115,11 @@ def writePlist(dataObject, filepath):
NSPropertyListSerialization.
dataFromPropertyList_format_errorDescription_(
dataObject, NSPropertyListXMLFormat_v1_0, None))
if not plistData:
error = error.encode('ascii', 'ignore')
if plistData is None:
if error:
error = error.encode('ascii', 'ignore')
else:
error = "Unknown error"
raise NSPropertyListSerializationException(error)
else:
if plistData.writeToFile_atomically_(filepath, True):
@@ -126,8 +135,11 @@ def writePlistToString(rootObject):
NSPropertyListSerialization.
dataFromPropertyList_format_errorDescription_(
rootObject, NSPropertyListXMLFormat_v1_0, None))
if not plistData:
error = error.encode('ascii', 'ignore')
if plistData is None:
if error:
error = error.encode('ascii', 'ignore')
else:
error = "Unknown error"
raise NSPropertyListSerializationException(error)
else:
return str(plistData)