diff options
| author | Georg Brandl <georg@python.org> | 2009-04-27 16:45:26 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-04-27 16:45:26 (GMT) |
| commit | 540b45c475aef0d2b803c4d4025a469eefeaa975 (patch) | |
| tree | cf008d7a05db532dcbfca275ee4cf60dd9d3d383 | |
| parent | 68998bf3ff432f35b54c63be82fe9711e830cedc (diff) | |
| download | cpython-540b45c475aef0d2b803c4d4025a469eefeaa975.zip cpython-540b45c475aef0d2b803c4d4025a469eefeaa975.tar.gz cpython-540b45c475aef0d2b803c4d4025a469eefeaa975.tar.bz2 | |
Merged revisions 71544,71546,71554-71555 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71544 | benjamin.peterson | 2009-04-13 01:19:56 +0200 (Mo, 13 Apr 2009) | 1 line
fix extra parenthesis #5774
........
r71546 | benjamin.peterson | 2009-04-13 01:44:15 +0200 (Mo, 13 Apr 2009) | 1 line
fix missing quote
........
r71554 | hirokazu.yamamoto | 2009-04-13 03:07:06 +0200 (Mo, 13 Apr 2009) | 1 line
Fixed typo. (email.Utils => email.utils)
........
r71555 | hirokazu.yamamoto | 2009-04-13 03:21:56 +0200 (Mo, 13 Apr 2009) | 1 line
Fixed another typos. (email.Utils => email.utils)
........
| -rw-r--r-- | Doc/library/email.message.rst | 8 | ||||
| -rw-r--r-- | Doc/library/multiprocessing.rst | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst index bb9c7c7..edeed16 100644 --- a/Doc/library/email.message.rst +++ b/Doc/library/email.message.rst @@ -349,13 +349,13 @@ Here are the methods of the :class:`Message` class: If your application doesn't care whether the parameter was encoded as in :rfc:`2231`, you can collapse the parameter value by calling - :func:`email.Utils.collapse_rfc2231_value`, passing in the return value + :func:`email.utils.collapse_rfc2231_value`, passing in the return value from :meth:`get_param`. This will return a suitably decoded Unicode string whn the value is a tuple, or the original string unquoted if it isn't. For example:: rawparam = msg.get_param('foo') - param = email.Utils.collapse_rfc2231_value(rawparam) + param = email.utils.collapse_rfc2231_value(rawparam) In any case, the parameter value (either the returned string, or the ``VALUE`` item in the 3-tuple) is always unquoted, unless *unquote* is set @@ -412,7 +412,7 @@ Here are the methods of the :class:`Message` class: does not have a ``filename`` parameter, this method falls back to looking for the ``name`` parameter. If neither is found, or the header is missing, then *failobj* is returned. The returned string will always be - unquoted as per :meth:`Utils.unquote`. + unquoted as per :func:`email.utils.unquote`. .. method:: get_boundary([failobj]) @@ -420,7 +420,7 @@ Here are the methods of the :class:`Message` class: Return the value of the ``boundary`` parameter of the :mailheader:`Content-Type` header of the message, or *failobj* if either the header is missing, or has no ``boundary`` parameter. The returned - string will always be unquoted as per :meth:`Utils.unquote`. + string will always be unquoted as per :func:`email.utils.unquote`. .. method:: set_boundary(boundary) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index b545904..8243b10 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -1160,7 +1160,7 @@ their parent process exits. The manager classes are defined in the Connect a local manager object to a remote manager process: >>> from multiprocessing.managers import BaseManager - >>> m = BaseManager(address='127.0.0.1', authkey='abc)) + >>> m = BaseManager(address='127.0.0.1', authkey='abc') >>> m.connect() .. method:: shutdown() |