Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

plistlib: improve bytes handling #9048

Merged
merged 2 commits into from
Nov 1, 2022

Conversation

sobolevn
Copy link
Member

dumps

>>> import plistlib
>>> plistlib.dumps(bytearray())
b'<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<data>\n</data>\n</plist>\n'
>>> plistlib.dumps(memoryview(b''))
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/Users/sobolev/.pyenv/versions/3.10.0/lib/python3.10/plistlib.py", line 901, in dumps
    dump(value, fp, fmt=fmt, skipkeys=skipkeys, sort_keys=sort_keys)
  File "/Users/sobolev/.pyenv/versions/3.10.0/lib/python3.10/plistlib.py", line 894, in dump
    writer.write(value)
  File "/Users/sobolev/.pyenv/versions/3.10.0/lib/python3.10/plistlib.py", line 325, in write
    self.write_value(value)
  File "/Users/sobolev/.pyenv/versions/3.10.0/lib/python3.10/plistlib.py", line 360, in write_value
    raise TypeError("unsupported type: %s" % type(value))
TypeError: unsupported type: <class 'memoryview'>

loads

>>> plistlib.loads(b'<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<integer>123</integer>\n</plist>\n')
123
>>> plistlib.loads(bytearray(b'<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<integer>123</integer>\n</plist>\n'))
123
>>> plistlib.loads(memoryview(b'<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<integer>123</integer>\n</plist>\n'))
123

readPlistFromBytes

It is using the same logic loads does: https://github.com/python/cpython/blob/948c6794711458fd148a3fa62296cadeeb2ed631/Lib/plistlib.py#L115-L123

@github-actions
Copy link
Contributor

According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉

@JelleZijlstra JelleZijlstra merged commit 34e147f into python:master Nov 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants