Merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 08:37:29 +01:00
commit cadc3fdcb5
59 changed files with 208 additions and 208 deletions

View file

@ -29,7 +29,7 @@ generically as an :term:`importer`) to participate in the import process.
:ref:`import`
The language reference for the :keyword:`import` statement.
`Packages specification <http://www.python.org/doc/essays/packages.html>`__
`Packages specification <https://www.python.org/doc/essays/packages.html>`__
Original specification of packages. Some semantics have changed since
the writing of this document (e.g. redirecting based on ``None``
in :data:`sys.modules`).