Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Lib/plistlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,16 +388,18 @@ def write_bytes(self, data):
def write_dict(self, d):
if d:
self.begin_element("dict")
if self._sort_keys:
items = sorted(d.items())
if self._skipkeys:
items = ((k, v) for k, v in d.items() if isinstance(k, str))
else:
for k in d:
if not isinstance(k, str):
raise TypeError("keys must be strings")
items = d.items()

if self._sort_keys:
items = sorted(items)

for key, value in items:
if not isinstance(key, str):
if self._skipkeys:
continue
raise TypeError("keys must be strings")
self.simple_element("key", key)
self.write_value(value)
self.end_element("dict")
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_plistlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,12 @@ def test_dump_naive_datetime_with_aware_datetime_option(self):
expected = dt.astimezone(datetime.UTC).replace(tzinfo=None)
self.assertEqual(parsed, expected)

def test_skipkeys_with_mixed_keys(self):
d = {1: "a", "z": "b", "a": "c"}
data = plistlib.dumps(d, skipkeys=True)
result = plistlib.loads(data)
self.assertEqual(result, {"a": "c", "z": "b"})


class TestBinaryPlistlib(unittest.TestCase):

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix plistlib.dumps() raising TypeError when skipkeys=True and a dictionary
contains mixed key types.
Loading