mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #21888: plistlib's load() and loads() now work if the fmt parameter is

Browse source 
specified.
This commit is contained in:
Serhiy Storchaka 2014-07-23 18:49:31 +03:00
parent 64a1207280
commit 8966759b03
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/plistlib.py
View file

@ -984,18 +984,16 @@ def load(fp, *, fmt=None, use_builtin_types=True, dict_type=dict):
fp.seek(0)
for info in _FORMATS.values():
if info['detect'](header):
p = info['parser'](
use_builtin_types=use_builtin_types,
dict_type=dict_type,
)
P = info['parser']
break
else:
raise InvalidFileException()
else:
p = _FORMATS[fmt]['parser'](use_builtin_types=use_builtin_types)
P = _FORMATS[fmt]['parser']
p = P(use_builtin_types=use_builtin_types, dict_type=dict_type)
return p.parse(fp)