diff options
| author | Georg Brandl <georg@python.org> | 2008-10-16 21:44:19 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-10-16 21:44:19 (GMT) |
| commit | fb362c33ffa9756df12a2de5bb743f2fa9fddfb6 (patch) | |
| tree | 30dfe0566a994074f9e5c8e8d7887db3a6a11e22 | |
| parent | 352ebae87efdd8dead814dfc7b153dabb26317d8 (diff) | |
| download | cpython-fb362c33ffa9756df12a2de5bb743f2fa9fddfb6.zip cpython-fb362c33ffa9756df12a2de5bb743f2fa9fddfb6.tar.gz cpython-fb362c33ffa9756df12a2de5bb743f2fa9fddfb6.tar.bz2 | |
Merged revisions 66928,66936,66939-66940 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66928 | georg.brandl | 2008-10-16 20:20:56 +0000 (Thu, 16 Oct 2008) | 2 lines
Add more TOC to the whatsnew index page.
........
r66936 | georg.brandl | 2008-10-16 21:20:15 +0000 (Thu, 16 Oct 2008) | 2 lines
#4131: FF3 doesn't write cookies.txt files.
........
r66939 | georg.brandl | 2008-10-16 21:36:39 +0000 (Thu, 16 Oct 2008) | 2 lines
part of #4012: kill off old name "processing".
........
r66940 | georg.brandl | 2008-10-16 21:38:48 +0000 (Thu, 16 Oct 2008) | 2 lines
#4083: add "as" to except handler grammar as per PEP 3110.
........
| -rw-r--r-- | Doc/library/cookielib.rst | 5 | ||||
| -rw-r--r-- | Doc/library/multiprocessing.rst | 10 | ||||
| -rw-r--r-- | Doc/reference/compound_stmts.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/index.rst | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/Doc/library/cookielib.rst b/Doc/library/cookielib.rst index bf166f6..022ac13 100644 --- a/Doc/library/cookielib.rst +++ b/Doc/library/cookielib.rst @@ -324,6 +324,11 @@ http://wwwsearch.sf.net/ClientCookie/. .. note:: + Version 3 of the Firefox web browser no longer writes cookies in the + ``cookies.txt`` file format. + + .. note:: + This loses information about RFC 2965 cookies, and also about newer or non-standard cookie-attributes such as ``port``. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index c5901fa..0874a80 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -378,8 +378,8 @@ The :mod:`multiprocessing` package mostly replicates the API of the Example usage of some of the methods of :class:`Process`:: - >>> import processing, time, signal - >>> p = processing.Process(target=time.sleep, args=(1000,)) + >>> import multiprocessing, time, signal + >>> p = multiprocessing.Process(target=time.sleep, args=(1000,)) >>> print p, p.is_alive() <Process(Process-1, initial)> False >>> p.start() @@ -1781,12 +1781,12 @@ handler type) for messages from different processes to get mixed up. Below is an example session with logging turned on:: - >>> import processing, logging - >>> logger = processing.getLogger() + >>> import multiprocessing, logging + >>> logger = multiprocessing.getLogger() >>> logger.setLevel(logging.INFO) >>> logger.warning('doomed') [WARNING/MainProcess] doomed - >>> m = processing.Manager() + >>> m = multiprocessing.Manager() [INFO/SyncManager-1] child process calling self.run() [INFO/SyncManager-1] manager bound to '\\\\.\\pipe\\pyc-2776-0-lj0tfa' >>> del m diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 0794755..408298d 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -221,7 +221,7 @@ for a group of statements: .. productionlist:: try_stmt: try1_stmt | try2_stmt try1_stmt: "try" ":" `suite` - : ("except" [`expression` ["," `target`]] ":" `suite`)+ + : ("except" [`expression` [("as" | ",") `target`]] ":" `suite`)+ : ["else" ":" `suite`] : ["finally" ":" `suite`] try2_stmt: "try" ":" `suite` diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst index b66fd3a..f82b58c 100644 --- a/Doc/whatsnew/index.rst +++ b/Doc/whatsnew/index.rst @@ -9,7 +9,7 @@ important changes between major Python versions. They are a "must read" for anyone wishing to stay up-to-date after a new release. .. toctree:: - :maxdepth: 1 + :maxdepth: 2 2.6.rst 2.5.rst |