[Python-checkins] cpython (merge 3.3 -> default): #17881: merge with 3.3.
ezio.melotti
python-checkins at python.org
Tue Apr 30 15:34:45 CEST 2013
http://hg.python.org/cpython/rev/1ec6d3cc217d
changeset: 83571:1ec6d3cc217d
parent: 83569:5389b1ab1ab9
parent: 83570:6e9d21761fc1
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue Apr 30 16:34:30 2013 +0300
summary:
#17881: merge with 3.3.
files:
Doc/library/plistlib.rst | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -47,8 +47,8 @@
.. 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 @@
.. 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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list