summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-30 13:34:30 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-30 13:34:30 (GMT)
commitf256f5f3ebf6574a2708cfea36d857846893e71f (patch)
treec5af85e81d70220ed324a5044bda76b144af24ea /Doc
parent60342fea4e5613be9a835ffe6a601cf1334f13f4 (diff)
parentab6ab15e7d4191fe8ea885262d48f880b591c7e8 (diff)
downloadcpython-f256f5f3ebf6574a2708cfea36d857846893e71f.zip
cpython-f256f5f3ebf6574a2708cfea36d857846893e71f.tar.gz
cpython-f256f5f3ebf6574a2708cfea36d857846893e71f.tar.bz2
#17881: merge with 3.3.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/plistlib.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst
index ae5e94d..a267368 100644
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -47,8 +47,8 @@ This module defines the following functions:
.. function:: readPlist(pathOrFile)
- Read a plist file. *pathOrFile* may either be a file name or a (readable)
- file object. Return the unpacked root object (which usually is a
+ Read a plist file. *pathOrFile* may either be a file name or a (readable and
+ binary) file object. Return the unpacked root object (which usually is a
dictionary).
The XML data is parsed using the Expat parser from :mod:`xml.parsers.expat`
@@ -59,7 +59,7 @@ This module defines the following functions:
.. function:: writePlist(rootObject, pathOrFile)
Write *rootObject* to a plist file. *pathOrFile* may either be a file name
- or a (writable) file object.
+ or a (writable and binary) file object.
A :exc:`TypeError` will be raised if the object is of an unsupported type or
a container that contains objects of unsupported types.