2007-08-15 11:28:22 -03:00
|
|
|
:mod:`xml.dom.minidom` --- Lightweight DOM implementation
|
|
|
|
=========================================================
|
|
|
|
|
|
|
|
.. module:: xml.dom.minidom
|
|
|
|
:synopsis: Lightweight Document Object Model (DOM) implementation.
|
|
|
|
.. moduleauthor:: Paul Prescod <paul@prescod.net>
|
|
|
|
.. sectionauthor:: Paul Prescod <paul@prescod.net>
|
|
|
|
.. sectionauthor:: Martin v. Löwis <martin@v.loewis.de>
|
|
|
|
|
|
|
|
|
|
|
|
:mod:`xml.dom.minidom` is a light-weight implementation of the Document Object
|
|
|
|
Model interface. It is intended to be simpler than the full DOM and also
|
|
|
|
significantly smaller.
|
|
|
|
|
|
|
|
DOM applications typically start by parsing some XML into a DOM. With
|
|
|
|
:mod:`xml.dom.minidom`, this is done through the parse functions::
|
|
|
|
|
|
|
|
from xml.dom.minidom import parse, parseString
|
|
|
|
|
|
|
|
dom1 = parse('c:\\temp\\mydata.xml') # parse an XML file by name
|
|
|
|
|
|
|
|
datasource = open('c:\\temp\\mydata.xml')
|
|
|
|
dom2 = parse(datasource) # parse an open file
|
|
|
|
|
|
|
|
dom3 = parseString('<myxml>Some data<empty/> some more data</myxml>')
|
|
|
|
|
|
|
|
The :func:`parse` function can take either a filename or an open file object.
|
|
|
|
|
|
|
|
|
2009-09-16 12:58:14 -03:00
|
|
|
.. function:: parse(filename_or_file, parser=None, bufsize=None)
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
Return a :class:`Document` from the given input. *filename_or_file* may be
|
|
|
|
either a file name, or a file-like object. *parser*, if given, must be a SAX2
|
|
|
|
parser object. This function will change the document handler of the parser and
|
|
|
|
activate namespace support; other parser configuration (like setting an entity
|
|
|
|
resolver) must have been done in advance.
|
|
|
|
|
|
|
|
If you have XML in a string, you can use the :func:`parseString` function
|
|
|
|
instead:
|
|
|
|
|
|
|
|
|
2009-09-16 12:58:14 -03:00
|
|
|
.. function:: parseString(string, parser=None)
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
Return a :class:`Document` that represents the *string*. This method creates a
|
|
|
|
:class:`StringIO` object for the string and passes that on to :func:`parse`.
|
|
|
|
|
|
|
|
Both functions return a :class:`Document` object representing the content of the
|
|
|
|
document.
|
|
|
|
|
|
|
|
What the :func:`parse` and :func:`parseString` functions do is connect an XML
|
|
|
|
parser with a "DOM builder" that can accept parse events from any SAX parser and
|
|
|
|
convert them into a DOM tree. The name of the functions are perhaps misleading,
|
|
|
|
but are easy to grasp when learning the interfaces. The parsing of the document
|
|
|
|
will be completed before these functions return; it's simply that these
|
|
|
|
functions do not provide a parser implementation themselves.
|
|
|
|
|
|
|
|
You can also create a :class:`Document` by calling a method on a "DOM
|
|
|
|
Implementation" object. You can get this object either by calling the
|
|
|
|
:func:`getDOMImplementation` function in the :mod:`xml.dom` package or the
|
|
|
|
:mod:`xml.dom.minidom` module. Using the implementation from the
|
|
|
|
:mod:`xml.dom.minidom` module will always return a :class:`Document` instance
|
|
|
|
from the minidom implementation, while the version from :mod:`xml.dom` may
|
|
|
|
provide an alternate implementation (this is likely if you have the `PyXML
|
|
|
|
package <http://pyxml.sourceforge.net/>`_ installed). Once you have a
|
|
|
|
:class:`Document`, you can add child nodes to it to populate the DOM::
|
|
|
|
|
|
|
|
from xml.dom.minidom import getDOMImplementation
|
|
|
|
|
|
|
|
impl = getDOMImplementation()
|
|
|
|
|
|
|
|
newdoc = impl.createDocument(None, "some_tag", None)
|
|
|
|
top_element = newdoc.documentElement
|
|
|
|
text = newdoc.createTextNode('Some textual content.')
|
|
|
|
top_element.appendChild(text)
|
|
|
|
|
|
|
|
Once you have a DOM document object, you can access the parts of your XML
|
|
|
|
document through its properties and methods. These properties are defined in
|
|
|
|
the DOM specification. The main property of the document object is the
|
|
|
|
:attr:`documentElement` property. It gives you the main element in the XML
|
|
|
|
document: the one that holds all others. Here is an example program::
|
|
|
|
|
|
|
|
dom3 = parseString("<myxml>Some data</myxml>")
|
|
|
|
assert dom3.documentElement.tagName == "myxml"
|
|
|
|
|
Merged revisions 77952,78030,78102,78104,78107,78206,78216,78296-78297,78328,78331-78332,78336,78339,78343,78378-78379,78415,78559,78717,78791 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77952 | mark.dickinson | 2010-02-03 10:50:14 -0600 (Wed, 03 Feb 2010) | 1 line
Fix test_inspect.py data to match recent change to inspect_fodder.py (r77942).
........
r78030 | benjamin.peterson | 2010-02-06 14:14:10 -0600 (Sat, 06 Feb 2010) | 1 line
check type_getattro for correctness in a descriptor corner case
........
r78102 | andrew.kuchling | 2010-02-07 19:35:35 -0600 (Sun, 07 Feb 2010) | 1 line
Move distutils into its own subsection; add various items
........
r78104 | andrew.kuchling | 2010-02-08 07:22:24 -0600 (Mon, 08 Feb 2010) | 1 line
Add two items; move a subsection
........
r78107 | antoine.pitrou | 2010-02-08 14:25:47 -0600 (Mon, 08 Feb 2010) | 3 lines
Clarify and correct description for ccbench and iobench.
........
r78206 | r.david.murray | 2010-02-16 11:55:26 -0600 (Tue, 16 Feb 2010) | 3 lines
Make the references to Popen in the description of Call
and check_call into links.
........
r78216 | andrew.kuchling | 2010-02-18 08:16:48 -0600 (Thu, 18 Feb 2010) | 1 line
Add various items
........
r78296 | andrew.kuchling | 2010-02-21 20:08:45 -0600 (Sun, 21 Feb 2010) | 1 line
Re-word
........
r78297 | andrew.kuchling | 2010-02-21 20:29:10 -0600 (Sun, 21 Feb 2010) | 1 line
#7076: mention SystemRandom class near start of the module docs; reword change description for clarity. Noted by Shawn Ligocki.
........
r78328 | jack.diederich | 2010-02-22 12:17:16 -0600 (Mon, 22 Feb 2010) | 1 line
fixes issue #7530, serve_forever()
........
r78331 | andrew.kuchling | 2010-02-22 12:38:23 -0600 (Mon, 22 Feb 2010) | 1 line
Fix comment typo
........
r78332 | andrew.kuchling | 2010-02-22 12:42:07 -0600 (Mon, 22 Feb 2010) | 2 lines
#7627: MH.remove() would fail if the MH mailbox was locked;
it would call _unlock_file() and pass it a closed file object. Noted by Rob Austein.
........
r78336 | jack.diederich | 2010-02-22 13:55:22 -0600 (Mon, 22 Feb 2010) | 1 line
fixes issue #1522237, bad init check in _threading_local
........
r78339 | jack.diederich | 2010-02-22 15:27:38 -0600 (Mon, 22 Feb 2010) | 1 line
* fix issue#7476
........
r78343 | andrew.kuchling | 2010-02-22 16:48:41 -0600 (Mon, 22 Feb 2010) | 10 lines
#2560: remove an unnecessary 'for' loop from my_fgets() in Parser/myreadline.c.
Noted by Joseph Armbruster; patch by Jessica McKellar.
The original code was 'for (;;) {...}', where ... ended
with a 'return -2' statement and did not contain a 'break' or 'continue'
statement. Therefore, the body of the loop is always executed once.
Once upon a time there was a 'continue' in the loop, but it was removed in
rev36346, committed by mwh on Wed Jul 7 17:44:12 2004.
........
r78378 | jack.diederich | 2010-02-23 11:23:30 -0600 (Tue, 23 Feb 2010) | 1 line
fixup markup error
........
r78379 | jack.diederich | 2010-02-23 13:34:06 -0600 (Tue, 23 Feb 2010) | 1 line
issue#6442 use in operator instead of has_key
........
r78415 | dirkjan.ochtman | 2010-02-23 22:00:52 -0600 (Tue, 23 Feb 2010) | 1 line
Issue #7733: add explicit reference in asyncore docs.
........
r78559 | andrew.kuchling | 2010-03-01 13:45:21 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: update discussion of minidom.unlink() and garbage collection
........
r78717 | benjamin.peterson | 2010-03-05 21:13:33 -0600 (Fri, 05 Mar 2010) | 1 line
settscdump is definitely an implementation detail
........
r78791 | andrew.kuchling | 2010-03-08 06:00:39 -0600 (Mon, 08 Mar 2010) | 1 line
Add various items
........
2010-03-21 19:03:03 -03:00
|
|
|
When you are finished with a DOM tree, you may optionally call the
|
|
|
|
:meth:`unlink` method to encourage early cleanup of the now-unneeded
|
|
|
|
objects. :meth:`unlink` is a :mod:`xml.dom.minidom`\ -specific
|
|
|
|
extension to the DOM API that renders the node and its descendants are
|
|
|
|
essentially useless. Otherwise, Python's garbage collector will
|
|
|
|
eventually take care of the objects in the tree.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
.. seealso::
|
|
|
|
|
|
|
|
`Document Object Model (DOM) Level 1 Specification <http://www.w3.org/TR/REC-DOM-Level-1/>`_
|
|
|
|
The W3C recommendation for the DOM supported by :mod:`xml.dom.minidom`.
|
|
|
|
|
|
|
|
|
|
|
|
.. _minidom-objects:
|
|
|
|
|
|
|
|
DOM Objects
|
|
|
|
-----------
|
|
|
|
|
|
|
|
The definition of the DOM API for Python is given as part of the :mod:`xml.dom`
|
|
|
|
module documentation. This section lists the differences between the API and
|
|
|
|
:mod:`xml.dom.minidom`.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Node.unlink()
|
|
|
|
|
|
|
|
Break internal references within the DOM so that it will be garbage collected on
|
|
|
|
versions of Python without cyclic GC. Even when cyclic GC is available, using
|
|
|
|
this can make large amounts of memory available sooner, so calling this on DOM
|
|
|
|
objects as soon as they are no longer needed is good practice. This only needs
|
|
|
|
to be called on the :class:`Document` object, but may be called on child nodes
|
|
|
|
to discard children of that node.
|
|
|
|
|
2010-06-09 05:13:42 -03:00
|
|
|
You can avoid calling this method explicitly by using the :keyword:`with`
|
|
|
|
statement. The following code will automatically unlink *dom* when the
|
|
|
|
:keyword:`with` block is exited::
|
|
|
|
|
|
|
|
with xml.dom.minidom.parse(datasource) as dom:
|
|
|
|
... # Work with dom.
|
|
|
|
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2009-09-16 12:58:14 -03:00
|
|
|
.. method:: Node.writexml(writer, indent="", addindent="", newl="", encoding="")
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
Write XML to the writer object. The writer should have a :meth:`write` method
|
|
|
|
which matches that of the file object interface. The *indent* parameter is the
|
|
|
|
indentation of the current node. The *addindent* parameter is the incremental
|
|
|
|
indentation to use for subnodes of the current one. The *newl* parameter
|
|
|
|
specifies the string to use to terminate newlines.
|
|
|
|
|
2007-09-01 10:51:09 -03:00
|
|
|
For the :class:`Document` node, an additional keyword argument *encoding* can be
|
|
|
|
used to specify the encoding field of the XML header.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
|
2009-09-16 12:58:14 -03:00
|
|
|
.. method:: Node.toxml(encoding=None)
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2010-07-25 20:23:30 -03:00
|
|
|
Return a string or byte string containing the XML represented by
|
|
|
|
the DOM node.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2010-07-25 20:23:30 -03:00
|
|
|
With an explicit *encoding* [1]_ argument, the result is a byte
|
|
|
|
string in the specified encoding. It is recommended that you
|
|
|
|
always specify an encoding; you may use any encoding you like, but
|
2010-07-26 09:54:02 -03:00
|
|
|
an argument of "utf-8" is the most common choice, avoiding
|
2010-07-25 20:23:30 -03:00
|
|
|
:exc:`UnicodeError` exceptions in case of unrepresentable text
|
|
|
|
data.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2010-07-25 20:23:30 -03:00
|
|
|
With no *encoding* argument, the result is a Unicode string, and the
|
|
|
|
XML declaration in the resulting string does not specify an
|
|
|
|
encoding. Encoding this string in an encoding other than UTF-8 is
|
|
|
|
likely incorrect, since UTF-8 is the default encoding of XML.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2009-09-16 12:58:14 -03:00
|
|
|
.. method:: Node.toprettyxml(indent="", newl="", encoding="")
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
Return a pretty-printed version of the document. *indent* specifies the
|
|
|
|
indentation string and defaults to a tabulator; *newl* specifies the string
|
|
|
|
emitted at the end of each line and defaults to ``\n``.
|
|
|
|
|
2010-07-26 09:54:02 -03:00
|
|
|
The *encoding* argument behaves like the corresponding argument of
|
|
|
|
:meth:`toxml`.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
|
|
|
|
.. _dom-example:
|
|
|
|
|
|
|
|
DOM Example
|
|
|
|
-----------
|
|
|
|
|
|
|
|
This example program is a fairly realistic example of a simple program. In this
|
|
|
|
particular case, we do not take much advantage of the flexibility of the DOM.
|
|
|
|
|
|
|
|
.. literalinclude:: ../includes/minidom-example.py
|
|
|
|
|
|
|
|
|
|
|
|
.. _minidom-and-dom:
|
|
|
|
|
|
|
|
minidom and the DOM standard
|
|
|
|
----------------------------
|
|
|
|
|
|
|
|
The :mod:`xml.dom.minidom` module is essentially a DOM 1.0-compatible DOM with
|
|
|
|
some DOM 2 features (primarily namespace features).
|
|
|
|
|
|
|
|
Usage of the DOM interface in Python is straight-forward. The following mapping
|
|
|
|
rules apply:
|
|
|
|
|
|
|
|
* Interfaces are accessed through instance objects. Applications should not
|
|
|
|
instantiate the classes themselves; they should use the creator functions
|
|
|
|
available on the :class:`Document` object. Derived interfaces support all
|
|
|
|
operations (and attributes) from the base interfaces, plus any new operations.
|
|
|
|
|
|
|
|
* Operations are used as methods. Since the DOM uses only :keyword:`in`
|
|
|
|
parameters, the arguments are passed in normal order (from left to right).
|
Merged revisions 59605-59624 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59606 | georg.brandl | 2007-12-29 11:57:00 +0100 (Sat, 29 Dec 2007) | 2 lines
Some cleanup in the docs.
........
r59611 | martin.v.loewis | 2007-12-29 19:49:21 +0100 (Sat, 29 Dec 2007) | 2 lines
Bug #1699: Define _BSD_SOURCE only on OpenBSD.
........
r59612 | raymond.hettinger | 2007-12-29 23:09:34 +0100 (Sat, 29 Dec 2007) | 1 line
Simpler documentation for itertools.tee(). Should be backported.
........
r59613 | raymond.hettinger | 2007-12-29 23:16:24 +0100 (Sat, 29 Dec 2007) | 1 line
Improve docs for itertools.groupby(). The use of xrange(0) to create a unique object is less obvious than object().
........
r59620 | christian.heimes | 2007-12-31 15:47:07 +0100 (Mon, 31 Dec 2007) | 3 lines
Added wininst-9.0.exe executable for VS 2008
Integrated bdist_wininst into PCBuild9 directory
........
r59621 | christian.heimes | 2007-12-31 15:51:18 +0100 (Mon, 31 Dec 2007) | 1 line
Moved PCbuild directory to PC/VS7.1
........
r59622 | christian.heimes | 2007-12-31 15:59:26 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot
........
r59623 | christian.heimes | 2007-12-31 16:02:41 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot, part 2
........
r59624 | christian.heimes | 2007-12-31 16:18:55 +0100 (Mon, 31 Dec 2007) | 1 line
Renamed PCBuild9 directory to PCBuild
........
2007-12-31 12:14:33 -04:00
|
|
|
There are no optional arguments. ``void`` operations return ``None``.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
* IDL attributes map to instance attributes. For compatibility with the OMG IDL
|
|
|
|
language mapping for Python, an attribute ``foo`` can also be accessed through
|
Merged revisions 59605-59624 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59606 | georg.brandl | 2007-12-29 11:57:00 +0100 (Sat, 29 Dec 2007) | 2 lines
Some cleanup in the docs.
........
r59611 | martin.v.loewis | 2007-12-29 19:49:21 +0100 (Sat, 29 Dec 2007) | 2 lines
Bug #1699: Define _BSD_SOURCE only on OpenBSD.
........
r59612 | raymond.hettinger | 2007-12-29 23:09:34 +0100 (Sat, 29 Dec 2007) | 1 line
Simpler documentation for itertools.tee(). Should be backported.
........
r59613 | raymond.hettinger | 2007-12-29 23:16:24 +0100 (Sat, 29 Dec 2007) | 1 line
Improve docs for itertools.groupby(). The use of xrange(0) to create a unique object is less obvious than object().
........
r59620 | christian.heimes | 2007-12-31 15:47:07 +0100 (Mon, 31 Dec 2007) | 3 lines
Added wininst-9.0.exe executable for VS 2008
Integrated bdist_wininst into PCBuild9 directory
........
r59621 | christian.heimes | 2007-12-31 15:51:18 +0100 (Mon, 31 Dec 2007) | 1 line
Moved PCbuild directory to PC/VS7.1
........
r59622 | christian.heimes | 2007-12-31 15:59:26 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot
........
r59623 | christian.heimes | 2007-12-31 16:02:41 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot, part 2
........
r59624 | christian.heimes | 2007-12-31 16:18:55 +0100 (Mon, 31 Dec 2007) | 1 line
Renamed PCBuild9 directory to PCBuild
........
2007-12-31 12:14:33 -04:00
|
|
|
accessor methods :meth:`_get_foo` and :meth:`_set_foo`. ``readonly``
|
2007-08-15 11:28:22 -03:00
|
|
|
attributes must not be changed; this is not enforced at runtime.
|
|
|
|
|
|
|
|
* The types ``short int``, ``unsigned int``, ``unsigned long long``, and
|
|
|
|
``boolean`` all map to Python integer objects.
|
|
|
|
|
|
|
|
* The type ``DOMString`` maps to Python strings. :mod:`xml.dom.minidom` supports
|
2008-02-01 07:56:49 -04:00
|
|
|
either bytes or strings, but will normally produce strings.
|
2007-08-15 11:28:22 -03:00
|
|
|
Values of type ``DOMString`` may also be ``None`` where allowed to have the IDL
|
|
|
|
``null`` value by the DOM specification from the W3C.
|
|
|
|
|
Merged revisions 59605-59624 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59606 | georg.brandl | 2007-12-29 11:57:00 +0100 (Sat, 29 Dec 2007) | 2 lines
Some cleanup in the docs.
........
r59611 | martin.v.loewis | 2007-12-29 19:49:21 +0100 (Sat, 29 Dec 2007) | 2 lines
Bug #1699: Define _BSD_SOURCE only on OpenBSD.
........
r59612 | raymond.hettinger | 2007-12-29 23:09:34 +0100 (Sat, 29 Dec 2007) | 1 line
Simpler documentation for itertools.tee(). Should be backported.
........
r59613 | raymond.hettinger | 2007-12-29 23:16:24 +0100 (Sat, 29 Dec 2007) | 1 line
Improve docs for itertools.groupby(). The use of xrange(0) to create a unique object is less obvious than object().
........
r59620 | christian.heimes | 2007-12-31 15:47:07 +0100 (Mon, 31 Dec 2007) | 3 lines
Added wininst-9.0.exe executable for VS 2008
Integrated bdist_wininst into PCBuild9 directory
........
r59621 | christian.heimes | 2007-12-31 15:51:18 +0100 (Mon, 31 Dec 2007) | 1 line
Moved PCbuild directory to PC/VS7.1
........
r59622 | christian.heimes | 2007-12-31 15:59:26 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot
........
r59623 | christian.heimes | 2007-12-31 16:02:41 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot, part 2
........
r59624 | christian.heimes | 2007-12-31 16:18:55 +0100 (Mon, 31 Dec 2007) | 1 line
Renamed PCBuild9 directory to PCBuild
........
2007-12-31 12:14:33 -04:00
|
|
|
* ``const`` declarations map to variables in their respective scope (e.g.
|
2007-08-15 11:28:22 -03:00
|
|
|
``xml.dom.minidom.Node.PROCESSING_INSTRUCTION_NODE``); they must not be changed.
|
|
|
|
|
|
|
|
* ``DOMException`` is currently not supported in :mod:`xml.dom.minidom`.
|
|
|
|
Instead, :mod:`xml.dom.minidom` uses standard Python exceptions such as
|
|
|
|
:exc:`TypeError` and :exc:`AttributeError`.
|
|
|
|
|
|
|
|
* :class:`NodeList` objects are implemented using Python's built-in list type.
|
2008-05-12 15:05:20 -03:00
|
|
|
These objects provide the interface defined in the DOM specification, but with
|
|
|
|
earlier versions of Python they do not support the official API. They are,
|
|
|
|
however, much more "Pythonic" than the interface defined in the W3C
|
|
|
|
recommendations.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
The following interfaces have no implementation in :mod:`xml.dom.minidom`:
|
|
|
|
|
|
|
|
* :class:`DOMTimeStamp`
|
|
|
|
|
2008-05-12 15:05:20 -03:00
|
|
|
* :class:`DocumentType`
|
2007-08-15 11:28:22 -03:00
|
|
|
|
2008-05-12 15:05:20 -03:00
|
|
|
* :class:`DOMImplementation`
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
* :class:`CharacterData`
|
|
|
|
|
|
|
|
* :class:`CDATASection`
|
|
|
|
|
|
|
|
* :class:`Notation`
|
|
|
|
|
|
|
|
* :class:`Entity`
|
|
|
|
|
|
|
|
* :class:`EntityReference`
|
|
|
|
|
|
|
|
* :class:`DocumentFragment`
|
|
|
|
|
|
|
|
Most of these reflect information in the XML document that is not of general
|
|
|
|
utility to most DOM users.
|
|
|
|
|
Merged revisions 61431,61433-61436,61439,61444,61449-61450,61453,61458,61465,61468,61471-61474,61480,61483-61484,61488,61495-61496,61498,61503-61504,61507,61509-61510,61515-61518 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61431 | vinay.sajip | 2008-03-16 22:35:58 +0100 (So, 16 Mär 2008) | 1 line
Clarified documentation on use of shutdown().
........
r61433 | mark.summerfield | 2008-03-17 09:28:15 +0100 (Mo, 17 Mär 2008) | 5 lines
Added a footnote to each pointing out that for XML output if an encoding
string is given it should conform to the appropriate XML standards---for
example, "UTF-8" is okay, but "UTF8" is not.
........
r61434 | eric.smith | 2008-03-17 12:01:01 +0100 (Mo, 17 Mär 2008) | 7 lines
Issue 2264: empty float presentation type needs to have at least one digit past the decimal point.
Added "Z" format_char to PyOS_ascii_formatd to support empty float presentation type.
Renamed buf_size in PyOS_ascii_formatd to more accurately reflect it's meaning.
Modified format.__float__ to use the new "Z" format as the default.
Added test cases.
........
r61435 | eric.smith | 2008-03-17 13:14:29 +0100 (Mo, 17 Mär 2008) | 2 lines
Reformated lines > 79 chars.
Deleted unused macro ISXDIGIT.
........
r61436 | jeffrey.yasskin | 2008-03-17 15:40:53 +0100 (Mo, 17 Mär 2008) | 13 lines
Allow Gnu gcc's to build python on OSX by removing -Wno-long-double,
-no-cpp-precomp, and -mno-fused-madd from configure.
* r22183 added -no-cpp-precomp, which
http://gcc.gnu.org/ml/gcc/2005-12/msg00368.html claims hasn't been
needed since gcc-3.1.
* r25607 added -Wno-long-double to avoid a warning in
Include/objimpl.h (issue 525481). The long double is still there,
but OSX 10.4's gcc no longer warns about it.
* r33666 fixed issue 775892 on OSX 10.3 by adding -mno-fused-madd,
which changed the sign of some float 0s. Tim Peters said it wasn't
a real issue anyway, and it no longer causes test failures.
Fixes issue #1779871.
........
r61439 | martin.v.loewis | 2008-03-17 17:31:57 +0100 (Mo, 17 Mär 2008) | 2 lines
Add Trent Nelson.
........
r61444 | travis.oliphant | 2008-03-17 18:36:12 +0100 (Mo, 17 Mär 2008) | 1 line
Add necessary headers to back-port new buffer protocol to Python 2.6
........
r61449 | gregory.p.smith | 2008-03-17 19:48:05 +0100 (Mo, 17 Mär 2008) | 8 lines
Force zlib.crc32 and zlib.adler32 to return a signed integer on all platforms
regardless of the native sizeof(long) used in the integer object.
This somewhat odd behavior of returning a signed is maintained in 2.x for
compatibility reasons of always returning an integer rather than a long object.
Fixes Issue1202 for Python 2.6
........
r61450 | neal.norwitz | 2008-03-17 20:02:45 +0100 (Mo, 17 Mär 2008) | 3 lines
Use a buffer large enough to ensure we don't overrun, even if the value
is outside the range we expect.
........
r61453 | steven.bethard | 2008-03-17 20:33:11 +0100 (Mo, 17 Mär 2008) | 1 line
Document unicode.isnumeric() and unicode.isdecimal() (issue2326)
........
r61458 | neal.norwitz | 2008-03-17 21:22:43 +0100 (Mo, 17 Mär 2008) | 5 lines
Issue 2321: reduce memory usage (increase the memory that is returned
to the system) by using pymalloc for the data of unicode objects.
Will backport.
........
r61465 | martin.v.loewis | 2008-03-17 22:55:30 +0100 (Mo, 17 Mär 2008) | 2 lines
Add David Wolever.
........
r61468 | gregory.p.smith | 2008-03-18 01:20:01 +0100 (Di, 18 Mär 2008) | 3 lines
Fix the IOError message text when opening a file with an invalid filename.
Error reported by Ilan Schnell.
........
r61471 | brett.cannon | 2008-03-18 02:00:07 +0100 (Di, 18 Mär 2008) | 2 lines
Convert test_strftime, test_getargs, and test_pep247 to use unittest.
........
r61472 | jeffrey.yasskin | 2008-03-18 02:09:59 +0100 (Di, 18 Mär 2008) | 2 lines
Fix build on platforms that don't have intptr_t. Patch by Joseph Armbruster.
........
r61473 | brett.cannon | 2008-03-18 02:50:25 +0100 (Di, 18 Mär 2008) | 2 lines
Convert test_dummy_threading and test_dbm to unittest.
........
r61474 | brett.cannon | 2008-03-18 02:58:56 +0100 (Di, 18 Mär 2008) | 2 lines
Move test_extcall to doctest.
........
r61480 | brett.cannon | 2008-03-18 04:46:22 +0100 (Di, 18 Mär 2008) | 2 lines
test_errno was a no-op test; now it actually tests things and uses unittest.
........
r61483 | brett.cannon | 2008-03-18 05:09:00 +0100 (Di, 18 Mär 2008) | 3 lines
Remove our implementation of memmove() and strerror(); both are in the C89
standard library.
........
r61484 | brett.cannon | 2008-03-18 05:16:06 +0100 (Di, 18 Mär 2008) | 2 lines
The output directory for tests that compare against stdout is now gone!
........
r61488 | jeffrey.yasskin | 2008-03-18 05:29:35 +0100 (Di, 18 Mär 2008) | 2 lines
Block the "socket.ssl() is deprecated" warning from test_socket_ssl.
........
r61495 | jeffrey.yasskin | 2008-03-18 05:56:06 +0100 (Di, 18 Mär 2008) | 4 lines
Speed test_thread up from 51.328s to 0.081s by reducing its sleep times. We
still sleep at all to make it likely that all threads are active at the same
time.
........
r61496 | jeffrey.yasskin | 2008-03-18 06:12:41 +0100 (Di, 18 Mär 2008) | 4 lines
Speed up test_dict by about 10x by only checking selected dict literal sizes,
instead of every integer from 0 to 400. Exhaustive testing wastes time without
providing enough more assurance that the code is correct.
........
r61498 | neal.norwitz | 2008-03-18 06:20:29 +0100 (Di, 18 Mär 2008) | 1 line
Try increasing the timeout to reduce the flakiness of this test.
........
r61503 | brett.cannon | 2008-03-18 06:43:04 +0100 (Di, 18 Mär 2008) | 2 lines
Improve the error message for a test that failed on the S-390 Debian buildbot.
........
r61504 | jeffrey.yasskin | 2008-03-18 06:45:40 +0100 (Di, 18 Mär 2008) | 3 lines
Add a -S/--slow flag to regrtest to have it print the 10 slowest tests with
their times.
........
r61507 | neal.norwitz | 2008-03-18 07:03:46 +0100 (Di, 18 Mär 2008) | 1 line
Add some info to the failure messages
........
r61509 | trent.nelson | 2008-03-18 08:02:12 +0100 (Di, 18 Mär 2008) | 1 line
Issue 2286: bump up the stack size of the 64-bit debug python_d.exe to 2100000. The default value of 200000 causes a stack overflow at 1965 iterations of r_object() in marshal.c, 35 iterations before the 2000 limit enforced by MAX_MARSHAL_STACK_DEPTH.
........
r61510 | trent.nelson | 2008-03-18 08:32:47 +0100 (Di, 18 Mär 2008) | 5 lines
The behaviour of winsound.Beep() seems to differ between different versions of Windows when there's either:
a) no sound card entirely
b) legacy beep driver has been disabled
c) the legacy beep driver has been uninstalled
Sometimes RuntimeErrors are raised, sometimes they're not. If _have_soundcard() returns False, don't expect winsound.Beep() to raise a RuntimeError, as this clearly isn't the case, as demonstrated by the various Win32 XP buildbots.
........
r61515 | martin.v.loewis | 2008-03-18 13:20:15 +0100 (Di, 18 Mär 2008) | 2 lines
norwitz-amd64 (gentoo) has EREMOTEIO.
........
r61516 | martin.v.loewis | 2008-03-18 13:45:37 +0100 (Di, 18 Mär 2008) | 2 lines
Add more Linux error codes.
........
r61517 | martin.v.loewis | 2008-03-18 14:05:03 +0100 (Di, 18 Mär 2008) | 2 lines
Add WSA errors.
........
r61518 | martin.v.loewis | 2008-03-18 14:16:05 +0100 (Di, 18 Mär 2008) | 2 lines
Note that the stderr output of the test is intentional.
........
2008-03-18 12:15:01 -03:00
|
|
|
.. rubric:: Footnotes
|
|
|
|
|
2010-07-25 20:23:30 -03:00
|
|
|
.. [#] The encoding name included in the XML output should conform to
|
|
|
|
the appropriate standards. For example, "UTF-8" is valid, but
|
|
|
|
"UTF8" is not valid in an XML document's declaration, even though
|
|
|
|
Python accepts it as an encoding name.
|
|
|
|
See http://www.w3.org/TR/2006/REC-xml11-20060816/#NT-EncodingDecl
|
Merged revisions 61431,61433-61436,61439,61444,61449-61450,61453,61458,61465,61468,61471-61474,61480,61483-61484,61488,61495-61496,61498,61503-61504,61507,61509-61510,61515-61518 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61431 | vinay.sajip | 2008-03-16 22:35:58 +0100 (So, 16 Mär 2008) | 1 line
Clarified documentation on use of shutdown().
........
r61433 | mark.summerfield | 2008-03-17 09:28:15 +0100 (Mo, 17 Mär 2008) | 5 lines
Added a footnote to each pointing out that for XML output if an encoding
string is given it should conform to the appropriate XML standards---for
example, "UTF-8" is okay, but "UTF8" is not.
........
r61434 | eric.smith | 2008-03-17 12:01:01 +0100 (Mo, 17 Mär 2008) | 7 lines
Issue 2264: empty float presentation type needs to have at least one digit past the decimal point.
Added "Z" format_char to PyOS_ascii_formatd to support empty float presentation type.
Renamed buf_size in PyOS_ascii_formatd to more accurately reflect it's meaning.
Modified format.__float__ to use the new "Z" format as the default.
Added test cases.
........
r61435 | eric.smith | 2008-03-17 13:14:29 +0100 (Mo, 17 Mär 2008) | 2 lines
Reformated lines > 79 chars.
Deleted unused macro ISXDIGIT.
........
r61436 | jeffrey.yasskin | 2008-03-17 15:40:53 +0100 (Mo, 17 Mär 2008) | 13 lines
Allow Gnu gcc's to build python on OSX by removing -Wno-long-double,
-no-cpp-precomp, and -mno-fused-madd from configure.
* r22183 added -no-cpp-precomp, which
http://gcc.gnu.org/ml/gcc/2005-12/msg00368.html claims hasn't been
needed since gcc-3.1.
* r25607 added -Wno-long-double to avoid a warning in
Include/objimpl.h (issue 525481). The long double is still there,
but OSX 10.4's gcc no longer warns about it.
* r33666 fixed issue 775892 on OSX 10.3 by adding -mno-fused-madd,
which changed the sign of some float 0s. Tim Peters said it wasn't
a real issue anyway, and it no longer causes test failures.
Fixes issue #1779871.
........
r61439 | martin.v.loewis | 2008-03-17 17:31:57 +0100 (Mo, 17 Mär 2008) | 2 lines
Add Trent Nelson.
........
r61444 | travis.oliphant | 2008-03-17 18:36:12 +0100 (Mo, 17 Mär 2008) | 1 line
Add necessary headers to back-port new buffer protocol to Python 2.6
........
r61449 | gregory.p.smith | 2008-03-17 19:48:05 +0100 (Mo, 17 Mär 2008) | 8 lines
Force zlib.crc32 and zlib.adler32 to return a signed integer on all platforms
regardless of the native sizeof(long) used in the integer object.
This somewhat odd behavior of returning a signed is maintained in 2.x for
compatibility reasons of always returning an integer rather than a long object.
Fixes Issue1202 for Python 2.6
........
r61450 | neal.norwitz | 2008-03-17 20:02:45 +0100 (Mo, 17 Mär 2008) | 3 lines
Use a buffer large enough to ensure we don't overrun, even if the value
is outside the range we expect.
........
r61453 | steven.bethard | 2008-03-17 20:33:11 +0100 (Mo, 17 Mär 2008) | 1 line
Document unicode.isnumeric() and unicode.isdecimal() (issue2326)
........
r61458 | neal.norwitz | 2008-03-17 21:22:43 +0100 (Mo, 17 Mär 2008) | 5 lines
Issue 2321: reduce memory usage (increase the memory that is returned
to the system) by using pymalloc for the data of unicode objects.
Will backport.
........
r61465 | martin.v.loewis | 2008-03-17 22:55:30 +0100 (Mo, 17 Mär 2008) | 2 lines
Add David Wolever.
........
r61468 | gregory.p.smith | 2008-03-18 01:20:01 +0100 (Di, 18 Mär 2008) | 3 lines
Fix the IOError message text when opening a file with an invalid filename.
Error reported by Ilan Schnell.
........
r61471 | brett.cannon | 2008-03-18 02:00:07 +0100 (Di, 18 Mär 2008) | 2 lines
Convert test_strftime, test_getargs, and test_pep247 to use unittest.
........
r61472 | jeffrey.yasskin | 2008-03-18 02:09:59 +0100 (Di, 18 Mär 2008) | 2 lines
Fix build on platforms that don't have intptr_t. Patch by Joseph Armbruster.
........
r61473 | brett.cannon | 2008-03-18 02:50:25 +0100 (Di, 18 Mär 2008) | 2 lines
Convert test_dummy_threading and test_dbm to unittest.
........
r61474 | brett.cannon | 2008-03-18 02:58:56 +0100 (Di, 18 Mär 2008) | 2 lines
Move test_extcall to doctest.
........
r61480 | brett.cannon | 2008-03-18 04:46:22 +0100 (Di, 18 Mär 2008) | 2 lines
test_errno was a no-op test; now it actually tests things and uses unittest.
........
r61483 | brett.cannon | 2008-03-18 05:09:00 +0100 (Di, 18 Mär 2008) | 3 lines
Remove our implementation of memmove() and strerror(); both are in the C89
standard library.
........
r61484 | brett.cannon | 2008-03-18 05:16:06 +0100 (Di, 18 Mär 2008) | 2 lines
The output directory for tests that compare against stdout is now gone!
........
r61488 | jeffrey.yasskin | 2008-03-18 05:29:35 +0100 (Di, 18 Mär 2008) | 2 lines
Block the "socket.ssl() is deprecated" warning from test_socket_ssl.
........
r61495 | jeffrey.yasskin | 2008-03-18 05:56:06 +0100 (Di, 18 Mär 2008) | 4 lines
Speed test_thread up from 51.328s to 0.081s by reducing its sleep times. We
still sleep at all to make it likely that all threads are active at the same
time.
........
r61496 | jeffrey.yasskin | 2008-03-18 06:12:41 +0100 (Di, 18 Mär 2008) | 4 lines
Speed up test_dict by about 10x by only checking selected dict literal sizes,
instead of every integer from 0 to 400. Exhaustive testing wastes time without
providing enough more assurance that the code is correct.
........
r61498 | neal.norwitz | 2008-03-18 06:20:29 +0100 (Di, 18 Mär 2008) | 1 line
Try increasing the timeout to reduce the flakiness of this test.
........
r61503 | brett.cannon | 2008-03-18 06:43:04 +0100 (Di, 18 Mär 2008) | 2 lines
Improve the error message for a test that failed on the S-390 Debian buildbot.
........
r61504 | jeffrey.yasskin | 2008-03-18 06:45:40 +0100 (Di, 18 Mär 2008) | 3 lines
Add a -S/--slow flag to regrtest to have it print the 10 slowest tests with
their times.
........
r61507 | neal.norwitz | 2008-03-18 07:03:46 +0100 (Di, 18 Mär 2008) | 1 line
Add some info to the failure messages
........
r61509 | trent.nelson | 2008-03-18 08:02:12 +0100 (Di, 18 Mär 2008) | 1 line
Issue 2286: bump up the stack size of the 64-bit debug python_d.exe to 2100000. The default value of 200000 causes a stack overflow at 1965 iterations of r_object() in marshal.c, 35 iterations before the 2000 limit enforced by MAX_MARSHAL_STACK_DEPTH.
........
r61510 | trent.nelson | 2008-03-18 08:32:47 +0100 (Di, 18 Mär 2008) | 5 lines
The behaviour of winsound.Beep() seems to differ between different versions of Windows when there's either:
a) no sound card entirely
b) legacy beep driver has been disabled
c) the legacy beep driver has been uninstalled
Sometimes RuntimeErrors are raised, sometimes they're not. If _have_soundcard() returns False, don't expect winsound.Beep() to raise a RuntimeError, as this clearly isn't the case, as demonstrated by the various Win32 XP buildbots.
........
r61515 | martin.v.loewis | 2008-03-18 13:20:15 +0100 (Di, 18 Mär 2008) | 2 lines
norwitz-amd64 (gentoo) has EREMOTEIO.
........
r61516 | martin.v.loewis | 2008-03-18 13:45:37 +0100 (Di, 18 Mär 2008) | 2 lines
Add more Linux error codes.
........
r61517 | martin.v.loewis | 2008-03-18 14:05:03 +0100 (Di, 18 Mär 2008) | 2 lines
Add WSA errors.
........
r61518 | martin.v.loewis | 2008-03-18 14:16:05 +0100 (Di, 18 Mär 2008) | 2 lines
Note that the stderr output of the test is intentional.
........
2008-03-18 12:15:01 -03:00
|
|
|
and http://www.iana.org/assignments/character-sets .
|