merge branch 3.5

Author: Anselm Kruis

.gitignore

@@ -11,6 +11,9 @@
 *.rej
 *.swp
 *~
+*.gc??
+*.profclang?
+*.profraw
 .gdb_history
 Doc/build/
 Doc/venv/

.hgignore

@@ -50,6 +50,9 @@ libpython*.so*
 *.pyd
 *.cover
 *~
+*.gc??
+*.profclang?
+*.profraw
 Lib/distutils/command/*.pdb
 Lib/lib2to3/*.pickle
 Lib/test/data/*

Doc/c-api/buffer.rst

@@ -133,15 +133,15 @@ a buffer, see :c:func:`PyObject_GetBuffer`.
       called on non-NULL :c:member:`~Py_buffer.format` values.
 
       Important exception: If a consumer requests a buffer without the
-      :c:macro:`PyBUF_FORMAT` flag, :c:member:`~Py_Buffer.format` will
+      :c:macro:`PyBUF_FORMAT` flag, :c:member:`~Py_buffer.format` will
       be set to  *NULL*,  but :c:member:`~Py_buffer.itemsize` still has
       the value for the original format.
 
-      If :c:member:`~Py_Buffer.shape` is present, the equality
+      If :c:member:`~Py_buffer.shape` is present, the equality
       ``product(shape) * itemsize == len`` still holds and the consumer
       can use :c:member:`~Py_buffer.itemsize` to navigate the buffer.
 
-      If :c:member:`~Py_Buffer.shape` is *NULL* as a result of a :c:macro:`PyBUF_SIMPLE`
+      If :c:member:`~Py_buffer.shape` is *NULL* as a result of a :c:macro:`PyBUF_SIMPLE`
       or a :c:macro:`PyBUF_WRITABLE` request, the consumer must disregard
       :c:member:`~Py_buffer.itemsize` and assume ``itemsize == 1``.
 
@@ -156,7 +156,7 @@ a buffer, see :c:func:`PyObject_GetBuffer`.
    .. c:member:: int ndim
 
       The number of dimensions the memory represents as an n-dimensional array.
-      If it is 0, :c:member:`~Py_Buffer.buf` points to a single item representing
+      If it is 0, :c:member:`~Py_buffer.buf` points to a single item representing
       a scalar. In this case, :c:member:`~Py_buffer.shape`, :c:member:`~Py_buffer.strides`
       and :c:member:`~Py_buffer.suboffsets` MUST be *NULL*.
 

Doc/c-api/typeobj.rst

@@ -94,7 +94,7 @@ type objects) *must* have the :attr:`ob_size` field.
    This field is not inherited by subtypes.
 
 
-.. c:member:: char* PyTypeObject.tp_name
+.. c:member:: const char* PyTypeObject.tp_name
 
    Pointer to a NUL-terminated string containing the name of the type. For types
    that are accessible as module globals, the string should be the full module
@@ -372,7 +372,7 @@ type objects) *must* have the :attr:`ob_size` field.
    inherited individually.
 
 
-.. c:member:: long PyTypeObject.tp_flags
+.. c:member:: unsigned long PyTypeObject.tp_flags
 
    This field is a bit mask of various flags.  Some flags indicate variant
    semantics for certain situations; others are used to indicate that certain
@@ -472,7 +472,7 @@ type objects) *must* have the :attr:`ob_size` field.
       .. versionadded:: 3.4
 
 
-.. c:member:: char* PyTypeObject.tp_doc
+.. c:member:: const char* PyTypeObject.tp_doc
 
    An optional pointer to a NUL-terminated C string giving the docstring for this
    type object.  This is exposed as the :attr:`__doc__` attribute on the type and
@@ -619,7 +619,7 @@ type objects) *must* have the :attr:`ob_size` field.
    +----------------+------------+
 
 
-.. c:member:: long PyTypeObject.tp_weaklistoffset
+.. c:member:: Py_ssize_t PyTypeObject.tp_weaklistoffset
 
    If the instances of this type are weakly referenceable, this field is greater
    than zero and contains the offset in the instance structure of the weak
@@ -786,7 +786,7 @@ type objects) *must* have the :attr:`ob_size` field.
    .. XXX explain.
 
 
-.. c:member:: long PyTypeObject.tp_dictoffset
+.. c:member:: Py_ssize_t PyTypeObject.tp_dictoffset
 
    If the instances of this type have a dictionary containing instance variables,
    this field is non-zero and contains the offset in the instances of the type of

Doc/distutils/apiref.rst

@@ -521,7 +521,7 @@ This module provides the following functions.
 
    .. method:: CCompiler.library_option(lib)
 
-      Return the compiler option to add *dir* to the list of libraries linked into the
+      Return the compiler option to add *lib* to the list of libraries linked into the
       shared library or executable.
 
 

Doc/extending/newtypes.rst

@@ -893,20 +893,20 @@ fields in the right order!  It's often easiest to find an example that includes
 all the fields you need (even if they're initialized to ``0``) and then change
 the values to suit your new type. ::
 
-   char *tp_name; /* For printing */
+   const char *tp_name; /* For printing */
 
 The name of the type - as mentioned in the last section, this will appear in
 various places, almost entirely for diagnostic purposes. Try to choose something
 that will be helpful in such a situation! ::
 
-   int tp_basicsize, tp_itemsize; /* For allocation */
+   Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */
 
 These fields tell the runtime how much memory to allocate when new objects of
 this type are created.  Python has some built-in support for variable length
 structures (think: strings, lists) which is where the :c:member:`~PyTypeObject.tp_itemsize` field
 comes in.  This will be dealt with later. ::
 
-   char *tp_doc;
+   const char *tp_doc;
 
 Here you can put a string (or its address) that you want returned when the
 Python script references ``obj.__doc__`` to retrieve the doc string.

Doc/extending/windows.rst

@@ -37,149 +37,9 @@ There are two approaches to building extension modules on Windows, just as there
 are on Unix: use the :mod:`distutils` package to control the build process, or
 do things manually.  The distutils approach works well for most extensions;
 documentation on using :mod:`distutils` to build and package extension modules
-is available in :ref:`distutils-index`.  This section describes the manual
-approach to building Python extensions written in C or C++.
-
-To build extensions using these instructions, you need to have a copy of the
-Python sources of the same version as your installed Python. You will need
-Microsoft Visual C++ "Developer Studio"; project files are supplied for VC++
-version 7.1, but you can use older versions of VC++.  Notice that you should use
-the same version of VC++that was used to build Python itself. The example files
-described here are distributed with the Python sources in the
-:file:`PC\\example_nt\\` directory.
-
-#. **Copy the example files** ---  The :file:`example_nt` directory is a
-   subdirectory of the :file:`PC` directory, in order to keep all the PC-specific
-   files under the same directory in the source distribution.  However, the
-   :file:`example_nt` directory can't actually be used from this location.  You
-   first need to copy or move it up one level, so that :file:`example_nt` is a
-   sibling of the :file:`PC` and :file:`Include` directories.  Do all your work
-   from within this new location.
-
-#. **Open the project** ---  From VC++, use the :menuselection:`File --> Open
-   Solution` dialog (not :menuselection:`File --> Open`!).  Navigate to and select
-   the file :file:`example.sln`, in the *copy* of the :file:`example_nt` directory
-   you made above.  Click Open.
-
-#. **Build the example DLL** ---  In order to check that everything is set up
-   right, try building:
-
-#. Select a configuration.  This step is optional.  Choose
-   :menuselection:`Build --> Configuration Manager --> Active Solution Configuration`
-   and select either :guilabel:`Release`  or :guilabel:`Debug`.  If you skip this
-   step, VC++ will use the Debug configuration by default.
-
-#. Build the DLL.  Choose :menuselection:`Build --> Build Solution`.  This
-   creates all intermediate and result files in a subdirectory called either
-   :file:`Debug` or :file:`Release`, depending on which configuration you selected
-   in the preceding step.
-
-#. **Testing the debug-mode DLL** ---  Once the Debug build has succeeded, bring
-   up a DOS box, and change to the :file:`example_nt\\Debug` directory.  You should
-   now be able to repeat the following session (``C>`` is the DOS prompt, ``>>>``
-   is the Python prompt; note that build information and various debug output from
-   Python may not match this screen dump exactly)::
-
-      C>..\..\PCbuild\python_d
-      Adding parser accelerators ...
-      Done.
-      Python 2.2 (#28, Dec 19 2001, 23:26:37) [MSC 32 bit (Intel)] on win32
-      Type "copyright", "credits" or "license" for more information.
-      >>> import example
-      [4897 refs]
-      >>> example.foo()
-      Hello, world
-      [4903 refs]
-      >>>
-
-   Congratulations!  You've successfully built your first Python extension module.
-
-#. **Creating your own project** ---  Choose a name and create a directory for
-   it.  Copy your C sources into it.  Note that the module source file name does
-   not necessarily have to match the module name, but the name of the
-   initialization function should match the module name --- you can only import a
-   module :mod:`spam` if its initialization function is called :c:func:`PyInit_spam`,
-   (see :ref:`building`, or use the minimal :file:`Modules/xxmodule.c` as a guide).
-   By convention, it lives in a file called :file:`spam.c` or :file:`spammodule.c`.
-   The output file should be called :file:`spam.pyd` (in Release mode) or
-   :file:`spam_d.pyd` (in Debug mode). The extension :file:`.pyd` was chosen
-   to avoid confusion with a system library :file:`spam.dll` to which your module
-   could be a Python interface.
-
-   Now your options are:
-
-#. Copy :file:`example.sln` and :file:`example.vcproj`, rename them to
-   :file:`spam.\*`, and edit them by hand, or
-
-#. Create a brand new project; instructions are below.
-
-   In either case, copy :file:`example_nt\\example.def` to :file:`spam\\spam.def`,
-   and edit the new :file:`spam.def` so its second line contains the string
-   '``initspam``'.  If you created a new project yourself, add the file
-   :file:`spam.def` to the project now.  (This is an annoying little file with only
-   two lines.  An alternative approach is to forget about the :file:`.def` file,
-   and add the option :option:`/export:initspam` somewhere to the Link settings, by
-   manually editing the setting in Project Properties dialog).
-
-#. **Creating a brand new project** ---  Use the :menuselection:`File --> New
-   --> Project` dialog to create a new Project Workspace.  Select :guilabel:`Visual
-   C++ Projects/Win32/ Win32 Project`, enter the name (``spam``), and make sure the
-   Location is set to parent of the :file:`spam` directory you have created (which
-   should be a direct subdirectory of the Python build tree, a sibling of
-   :file:`Include` and :file:`PC`).  Select Win32 as the platform (in my version,
-   this is the only choice).  Make sure the Create new workspace radio button is
-   selected.  Click OK.
-
-   You should now create the file :file:`spam.def` as instructed in the previous
-   section. Add the source files to the project, using :menuselection:`Project -->
-   Add Existing Item`. Set the pattern to ``*.*`` and select both :file:`spam.c`
-   and :file:`spam.def` and click OK.  (Inserting them one by one is fine too.)
-
-   Now open the :menuselection:`Project --> spam properties` dialog. You only need
-   to change a few settings.  Make sure :guilabel:`All Configurations` is selected
-   from the :guilabel:`Settings for:` dropdown list.  Select the C/C++ tab.  Choose
-   the General category in the popup menu at the top.  Type the following text in
-   the entry box labeled :guilabel:`Additional Include Directories`::
-
-      ..\Include,..\PC
-
-   Then, choose the General category in the Linker tab, and enter ::
-
-      ..\PCbuild
-
-   in the text box labelled :guilabel:`Additional library Directories`.
-
-   Now you need to add some mode-specific settings:
-
-   Select :guilabel:`Release` in the :guilabel:`Configuration` dropdown list.
-   Choose the :guilabel:`Link` tab, choose the :guilabel:`Input` category, and
-   append ``pythonXY.lib`` to the list in the :guilabel:`Additional Dependencies`
-   box.
-
-   Select :guilabel:`Debug` in the :guilabel:`Configuration` dropdown list, and
-   append ``pythonXY_d.lib`` to the list in the :guilabel:`Additional Dependencies`
-   box.  Then click the C/C++ tab, select :guilabel:`Code Generation`, and select
-   :guilabel:`Multi-threaded Debug DLL` from the :guilabel:`Runtime library`
-   dropdown list.
-
-   Select :guilabel:`Release` again from the :guilabel:`Configuration` dropdown
-   list.  Select :guilabel:`Multi-threaded DLL` from the :guilabel:`Runtime
-   library` dropdown list.
-
-If your module creates a new type, you may have trouble with this line::
-
-   PyVarObject_HEAD_INIT(&PyType_Type, 0)
-
-Static type object initializers in extension modules may cause
-compiles to fail with an error message like "initializer not a
-constant".  This shows up when building DLL under MSVC.  Change it to::
-
-   PyVarObject_HEAD_INIT(NULL, 0)
-
-and add the following to the module initialization function::
-
-   if (PyType_Ready(&MyObject_Type) < 0)
-        return NULL;
+is available in :ref:`distutils-index`.  If you find you really need to do
+things manually, it may be instructive to study the project file for the
+:source:`winsound <PCbuild/winsound.vcxproj>` standard library module.
 
 
 .. _dynamic-linking:

Doc/faq/extending.rst

@@ -348,7 +348,7 @@ complete example using the GNU readline library (you may want to ignore
      {
        line = readline (prompt);
 
-       if (NULL == line)                          /* CTRL-D pressed */
+       if (NULL == line)                          /* Ctrl-D pressed */
        {
          done = 1;
        }

Doc/faq/programming.rst

@@ -1164,6 +1164,8 @@ analogue of lisp car is ``lisp_list[0]`` and the analogue of cdr is
 usually a lot slower than using Python lists.
 
 
+.. _faq-multidimensional-list:
+
 How do I create a multidimensional list?
 ----------------------------------------
 

Doc/faq/windows.rst

@@ -81,14 +81,14 @@ by entering a few expressions of your choice and seeing the results::
     'HelloHelloHello'
 
 Many people use the interactive mode as a convenient yet highly programmable
-calculator.  When you want to end your interactive Python session, hold the Ctrl
-key down while you enter a Z, then hit the "Enter" key to get back to your
+calculator.  When you want to end your interactive Python session, hold the :kbd:`Ctrl`
+key down while you enter a :kbd:`Z`, then hit the ":kbd:`Enter`" key to get back to your
 Windows command prompt.
 
 You may also find that you have a Start-menu entry such as :menuselection:`Start
 --> Programs --> Python 3.3 --> Python (command line)` that results in you
 seeing the ``>>>`` prompt in a new window.  If so, the window will disappear
-after you enter the Ctrl-Z character; Windows is running a single "python"
+after you enter the :kbd:`Ctrl-Z` character; Windows is running a single "python"
 command in the window, and closes it when you terminate the interpreter.
 
 If the ``python`` command, instead of displaying the interpreter prompt ``>>>``,
@@ -131,8 +131,8 @@ you should make sure that entering the command ::
 
    c:\Python33\python
 
-starts up the interpreter as above (and don't forget you'll need a "CTRL-Z" and
-an "Enter" to get out of it). Once you have verified the directory, you can
+starts up the interpreter as above (and don't forget you'll need a ":kbd:`Ctrl-Z`" and
+an ":kbd:`Enter`" to get out of it). Once you have verified the directory, you can
 add it to the system path to make it easier to start Python by just running
 the ``python`` command. This is currently an option in the installer as of
 CPython 3.3.
@@ -327,7 +327,7 @@ Prior to Python 2.7 and 3.2, to terminate a process, you can use :mod:`ctypes`::
        return (0 != kernel32.TerminateProcess(handle, 0))
 
 In 2.7 and 3.2, :func:`os.kill` is implemented similar to the above function,
-with the additional feature of being able to send CTRL+C and CTRL+BREAK
+with the additional feature of being able to send :kbd:`Ctrl+C` and :kbd:`Ctrl+Break`
 to console subprocesses which are designed to handle those signals. See
 :func:`os.kill` for further details.
 

Doc/howto/urllib2.rst

@@ -174,7 +174,7 @@ Explorer [#]_. ::
     import urllib.request
 
     url = 'http://www.someserver.com/cgi-bin/register.cgi'
-    user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
+    user_agent = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64)'
     values = {'name' : 'Michael Foord',
               'location' : 'Northampton',
               'language' : 'Python' }
@@ -572,8 +572,7 @@ Footnotes
 
 This document was reviewed and revised by John Lee.
 
-.. [#] Like Google for example. The *proper* way to use google from a program
-       is to use `PyGoogle <http://pygoogle.sourceforge.net>`_ of course.
+.. [#] Google for example.
 .. [#] Browser sniffing is a very bad practise for website design - building
        sites using web standards is much more sensible. Unfortunately a lot of
        sites still send different versions to different browsers.