diff options
| author | Charles-François Natali <cf.natali@gmail.com> | 2014-07-25 17:45:02 (GMT) |
|---|---|---|
| committer | Charles-François Natali <cf.natali@gmail.com> | 2014-07-25 17:45:02 (GMT) |
| commit | e396c363cbacce68d7750a7963af4d7cd3bf30e7 (patch) | |
| tree | 40f9f102e9d7908e6bf4349128d42419e8735fec /Lib/plistlib.py | |
| parent | 65708cf510277492660420efa13bd2de163cd21b (diff) | |
| parent | 2955a0bf06807d4e00ad053a7e2acb516939859e (diff) | |
| download | cpython-e396c363cbacce68d7750a7963af4d7cd3bf30e7.zip cpython-e396c363cbacce68d7750a7963af4d7cd3bf30e7.tar.gz cpython-e396c363cbacce68d7750a7963af4d7cd3bf30e7.tar.bz2 | |
Merge.
Diffstat (limited to 'Lib/plistlib.py')
| -rw-r--r-- | Lib/plistlib.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/plistlib.py b/Lib/plistlib.py index 8c148a8..b9946fd 100644 --- a/Lib/plistlib.py +++ b/Lib/plistlib.py @@ -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) |