diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:26:45 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:26:45 +0000 |
| commit | 821fc088535cd2acbb149dbe85bd5dee7619083f (patch) | |
| tree | a03cb58bd6482998c0c932638728e49178644119 | |
| parent | 2c35c169569e9b40309fdbb6e7baf0d93c6e7f97 (diff) | |
| download | cpython-git-821fc088535cd2acbb149dbe85bd5dee7619083f.tar.gz | |
Merged revisions 83106 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83106 | georg.brandl | 2010-07-23 18:55:26 +0200 (Fr, 23 Jul 2010) | 1 line
Fix some markup glitches.
........
| -rw-r--r-- | Doc/library/urllib2.rst | 3 | ||||
| -rw-r--r-- | Doc/whatsnew/2.0.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/2.5.rst | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst index 7fcce4f791..b8f2277536 100644 --- a/Doc/library/urllib2.rst +++ b/Doc/library/urllib2.rst @@ -464,7 +464,8 @@ sorting the handler instances. named :meth:`unknown_open`. Note that the implementation of these methods may involve calls of the parent - :class:`OpenerDirector` instance's :meth:`.open` and :meth:`.error` methods. + :class:`OpenerDirector` instance's :meth:`~OpenerDirector.open` and + :meth:`~OpenerDirector.error` methods. #. Every handler with a method named like :samp:`{protocol}_response` has that method called to post-process the response. diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 5fd53d165e..3bb12b666c 100644 --- a/Doc/whatsnew/2.0.rst +++ b/Doc/whatsnew/2.0.rst @@ -656,7 +656,7 @@ break. The change which will probably break the most code is tightening up the arguments accepted by some methods. Some methods would take multiple arguments and treat them as a tuple, particularly various list methods such as -:meth:`.append` and :meth:`.insert`. In earlier versions of Python, if ``L`` is +:meth:`append` and :meth:`insert`. In earlier versions of Python, if ``L`` is a list, ``L.append( 1,2 )`` appends the tuple ``(1,2)`` to the list. In Python 2.0 this causes a :exc:`TypeError` exception to be raised, with the message: 'append requires exactly 1 argument; 2 given'. The fix is to simply add an diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst index ca87dbb1ee..c7f7d586ab 100644 --- a/Doc/whatsnew/2.5.rst +++ b/Doc/whatsnew/2.5.rst @@ -1765,7 +1765,7 @@ Full documentation for ElementTree is available at http://effbot.org/zone/element-index.htm. ElementTree represents an XML document as a tree of element nodes. The text -content of the document is stored as the :attr:`.text` and :attr:`.tail` +content of the document is stored as the :attr:`text` and :attr:`tail` attributes of (This is one of the major differences between ElementTree and the Document Object Model; in the DOM there are many different types of node, including :class:`TextNode`.) |