[Python-checkins] r66941 - in python/branches/release26-maint: Doc/library/cookielib.rst Doc/library/multiprocessing.rst Doc/reference/compound_stmts.rst Doc/whatsnew/index.rst

[georg.brandl]

Author: georg.brandl
Date: Thu Oct 16 23:44:19 2008
New Revision: 66941

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/cookielib.rst
   python/branches/release26-maint/Doc/library/multiprocessing.rst
   python/branches/release26-maint/Doc/reference/compound_stmts.rst
   python/branches/release26-maint/Doc/whatsnew/index.rst

Modified: python/branches/release26-maint/Doc/library/cookielib.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/cookielib.rst	(original)
+++ python/branches/release26-maint/Doc/library/cookielib.rst	Thu Oct 16 23:44:19 2008
@@ -324,6 +324,11 @@
 
    .. 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``.
 

Modified: python/branches/release26-maint/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/multiprocessing.rst	(original)
+++ python/branches/release26-maint/Doc/library/multiprocessing.rst	Thu Oct 16 23:44:19 2008
@@ -378,8 +378,8 @@
 
    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 @@
 
 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

Modified: python/branches/release26-maint/Doc/reference/compound_stmts.rst
==============================================================================
--- python/branches/release26-maint/Doc/reference/compound_stmts.rst	(original)
+++ python/branches/release26-maint/Doc/reference/compound_stmts.rst	Thu Oct 16 23:44:19 2008
@@ -221,7 +221,7 @@
 .. 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`

Modified: python/branches/release26-maint/Doc/whatsnew/index.rst
==============================================================================
--- python/branches/release26-maint/Doc/whatsnew/index.rst	(original)
+++ python/branches/release26-maint/Doc/whatsnew/index.rst	Thu Oct 16 23:44:19 2008
@@ -9,7 +9,7 @@
 anyone wishing to stay up-to-date after a new release.
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
    2.6.rst
    2.5.rst