pythoncapi
diff --git a/‎Doc/glossary.rst‎
Lines changed: 149 additions & 85 deletions b/‎Doc/glossary.rst‎
Lines changed: 149 additions & 85 deletions
diff --git a/‎Doc/library/2to3.rst‎
Lines changed: 6 additions & 6 deletions b/‎Doc/library/2to3.rst‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎Doc/library/collections.rst‎
Lines changed: 1 addition & 1 deletion b/‎Doc/library/collections.rst‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Doc/library/compileall.rst‎
Lines changed: 7 additions & 2 deletions b/‎Doc/library/compileall.rst‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎Doc/tutorial/errors.rst‎
Lines changed: 1 addition & 1 deletion b/‎Doc/tutorial/errors.rst‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Doc/whatsnew/2.6.rst‎
Lines changed: 31 additions & 10 deletions b/‎Doc/whatsnew/2.6.rst‎
Lines changed: 31 additions & 10 deletions
diff --git a/‎Misc/find_recursionlimit.py‎
Lines changed: 21 additions & 8 deletions b/‎Misc/find_recursionlimit.py‎
Lines changed: 21 additions & 8 deletions
@@ -79,12 +79,12 @@ flag.  Note that *only* doctests will be refactored.
 The :option:`-v` option enables the output of more information on the
 translation process.
 
-When the :option:`-p` is passed to it, 2to3 treats ``print`` as a function
-instead of a statement.  This is useful when ``from __future__ import
-print_function`` is being used.  If this option is not given, the print fixer
-will surround print calls in an extra set of parentheses because it cannot
-differentiate between the and print statement with parentheses (such as ``print
-("a" + "b" + "c")``) and a true function call.
+When the :option:`-p` is passed, 2to3 treats ``print`` as a function instead of
+a statement.  This is useful when ``from __future__ import print_function`` is
+being used.  If this option is not given, the print fixer will surround print
+calls in an extra set of parentheses because it cannot differentiate between the
+and print statement with parentheses (such as ``print ("a" + "b" + "c")``) and a
+true function call.
 
 
 :mod:`lib2to3` - 2to3's library
 
@@ -359,7 +359,7 @@ in Unix::
 
    .. method:: defaultdict.__missing__(key)
 
-      If the :attr:`default_factory` attribute is ``None``, this raises an
+      If the :attr:`default_factory` attribute is ``None``, this raises a
       :exc:`KeyError` exception with the *key* as argument.
 
       If :attr:`default_factory` is not ``None``, it is called without arguments
 
@@ -11,8 +11,13 @@ libraries.  These functions compile Python source files in a directory tree,
 allowing users without permission to write to the libraries to take advantage of
 cached byte-code files.
 
-The source file for this module may also be used as a script to compile Python
-sources in directories named on the command line or in ``sys.path``.
+This module may also be used as a script (using the :option:`-m` Python flag) to
+compile Python sources.  Directories to recursively traverse (passing
+:option:`-l` stops the recursive behavior) for sources are listed on the command
+line.  If no arguments are given, the invocation is equivalent to ``-l
+sys.path``.  Printing lists of the files compiled can be disabled with the
+:option:`-q` flag.  In addition, the :option:`-x` option takes a regular
+expression argument.  All files that match the expression will be skipped.
 
 
 .. function:: compile_dir(dir[, maxlevels[, ddir[, force[,  rx[, quiet]]]]])
 
@@ -368,7 +368,7 @@ complicated example::
 As you can see, the :keyword:`finally` clause is executed in any event.  The
 :exc:`TypeError` raised by dividing two strings is not handled by the
 :keyword:`except` clause and therefore re-raised after the :keyword:`finally`
-clauses has been executed.
+clause has been executed.
 
 In real world applications, the :keyword:`finally` clause is useful for
 releasing external resources (such as files or network connections), regardless
 
@@ -1723,9 +1723,6 @@ Optimizations
   free lists when garbage-collecting the highest generation of objects.
   This may return memory to the operating system sooner.
 
-The net result of the 2.6 optimizations is that Python 2.6 runs the pystone
-benchmark around XXX% faster than Python 2.5.
-
 .. ======================================================================
 
 .. _new-26-interpreter:
@@ -1794,7 +1791,6 @@ changes, or look through the Subversion logs for all the details.
   :mod:`mimetools`,
   :mod:`multifile`,
   :mod:`new`,
-  :mod:`popen2`,
   :mod:`pure`,
   :mod:`statvfs`,
   :mod:`sunaudiodev`,
@@ -1806,12 +1802,10 @@ changes, or look through the Subversion logs for all the details.
   were applied.  (Maintained by Josiah Carlson; see :issue:`1736190` for
   one patch.)
 
-.. |uacute| unicode:: 0xA9
-
-* The :mod:`bsddb` module also has a new maintainer, Jes|uacute|s Cea,
-  and the package is now available as a standalone package.
-  The web page for the package is
-  `www.jcea.es/programacion/pybsddb.htm <http://www.jcea.es/programacion/pybsddb.htm>`__.
+* The :mod:`bsddb` module also has a new maintainer, Jesús Cea, and the package
+  is now available as a standalone package.  The web page for the package is
+  `www.jcea.es/programacion/pybsddb.htm
+  <http://www.jcea.es/programacion/pybsddb.htm>`__.
 
 * The :mod:`bsddb.dbshelve` module now uses the highest pickling protocol
   available, instead of restricting itself to protocol 1.
@@ -2134,6 +2128,13 @@ changes, or look through the Subversion logs for all the details.
 
   (Contributed by Christian Heimes and Mark Dickinson.)
 
+* The :mod:`MimeWriter` module and :mod:`mimify` module
+  have been deprecated; use the :mod:`email`
+  package instead.
+
+* The :mod:`md5` module has been deprecated; use the :mod:`hashlib` module
+  instead.
+
 * :class:`mmap` objects now have a :meth:`rfind` method that searches for a
   substring beginning at the end of the string and searching
   backwards.  The :meth:`find` method also gained an *end* parameter
@@ -2216,6 +2217,9 @@ changes, or look through the Subversion logs for all the details.
   and can optionally take new command-line arguments for the program.
   (Contributed by Rocky Bernstein; :issue:`1393667`.)
 
+* The :mod:`posixfile` module has been deprecated; :func:`fcntl.lockf`
+  provides better locking.
+
   The :func:`post_mortem` function, used to begin debugging a
   traceback, will now use the traceback returned by :func:`sys.exc_info`
   if no traceback is supplied.   (Contributed by Facundo Batista;
@@ -2226,6 +2230,9 @@ changes, or look through the Subversion logs for all the details.
   opcodes, returning a shorter pickle that contains the same data structure.
   (Contributed by Raymond Hettinger.)
 
+* The :mod:`popen2` module has been deprecated; use the :mod:`subprocess`
+  module.
+
 * A :func:`get_data` function was added to the :mod:`pkgutil`
   module that returns the contents of resource files included
   with an installed Python package.  For example::
@@ -2305,6 +2312,9 @@ changes, or look through the Subversion logs for all the details.
 * The :mod:`sets` module has been deprecated; it's better to
   use the built-in :class:`set` and :class:`frozenset` types.
 
+* The :mod:`sha` module has been deprecated; use the :mod:`hashlib` module
+  instead.
+
 * The :func:`shutil.copytree` function now has an optional *ignore* argument
   that takes a callable object.  This callable will receive each directory path
   and a list of the directory's contents, and returns a list of names that
@@ -2390,6 +2400,10 @@ changes, or look through the Subversion logs for all the details.
   (Contributed by Pedro Werneck and Jeffrey Yasskin;
   :issue:`742598`, :issue:`1193577`.)
 
+* The :mod:`sqlite3` module, maintained by Gerhard Haering,
+  has been updated from version 2.3.2 in Python 2.5 to 
+  version 2.4.1.
+ 
 * The :mod:`struct` module now supports the C99 :ctype:`_Bool` type,
   using the format character ``'?'``.
   (Contributed by David Remahl.)
@@ -3158,6 +3172,13 @@ that may require changes to your code:
   before adding elements from the iterable.  This change makes the
   behavior match ``list.__init__()``.
 
+* :meth:`object.__init__` previously accepted arbitrary arguments and
+  keyword arguments, ignoring them.  In Python 2.6, this is no longer
+  allowed and will result in a :exc:`TypeError`.  This will affect 
+  :meth:`__init__` methods that end up calling the corresponding 
+  method on :class:`object` (perhaps through using :func:`super`).
+  See :issue:`1683368` for discussion.
+
 * The :class:`Decimal` constructor now accepts leading and trailing
   whitespace when passed a string.  Previously it would raise an
   :exc:`InvalidOperation` exception.  On the other hand, the
 
@@ -1,22 +1,32 @@
 #! /usr/bin/env python
-"""Find the maximum recursion limit that prevents core dumps
+"""Find the maximum recursion limit that prevents interpreter termination.
 
 This script finds the maximum safe recursion limit on a particular
 platform.  If you need to change the recursion limit on your system,
 this script will tell you a safe upper bound.  To use the new limit,
-call sys.setrecursionlimit.
+call sys.setrecursionlimit().
 
 This module implements several ways to create infinite recursion in
 Python.  Different implementations end up pushing different numbers of
 C stack frames, depending on how many calls through Python's abstract
 C API occur.
 
-After each round of tests, it prints a message
-Limit of NNNN is fine.
+After each round of tests, it prints a message:
+"Limit of NNNN is fine".
 
-It ends when Python causes a segmentation fault because the limit is
-too high.  On platforms like Mac and Windows, it should exit with a
-MemoryError.
+The highest printed value of "NNNN" is therefore the highest potentially
+safe limit for your system (which depends on the OS, architecture, but also
+the compilation flags). Please note that it is practically impossible to
+test all possible recursion paths in the interpreter, so the results of
+this test should not be trusted blindly -- although they give a good hint
+of which values are reasonable.
+
+NOTE: When the C stack space allocated by your system is exceeded due
+to excessive recursion, exact behaviour depends on the platform, although
+the interpreter will always fail in a likely brutal way: either a
+segmentation fault, a MemoryError, or just a silent abort.
+
+NB: A program that does not use __methods__ can set a higher limit.
 """
 
 import sys
@@ -87,7 +97,10 @@ def check_limit(n, test_func_name):
     test_func = globals()[test_func_name]
     try:
         test_func()
-    except RuntimeError:
+    # AttributeError can be raised because of the way e.g. PyDict_GetItem()
+    # silences all exceptions and returns NULL, which is usually interpreted
+    # as "missing attribute".
+    except (RuntimeError, AttributeError):
         pass
     else:
         print("Yikes!")