mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge with 3.4

Browse source
This commit is contained in:
Georg Brandl 2014-10-29 10:27:06 +01:00
commit 794e9bf1fe
41 changed files with 145 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/reference/import.rst
View file

@ -901,7 +901,7 @@ References
The import machinery has evolved considerably since Python's early days. The
original `specification for packages
<https://www.python.org/doc/essays/packages.html>`_ is still available to read,
<http://legacy.python.org/doc/essays/packages.html>`_ is still available to read,
although some details have changed since the writing of that document.
The original specification for :data:`sys.meta_path` was :pep:`302`, with

2
Doc/reference/introduction.rst
View file

@ -66,7 +66,7 @@ IronPython
An alternate Python for .NET. Unlike Python.NET, this is a complete Python
implementation that generates IL, and compiles Python code directly to .NET
assemblies. It was created by Jim Hugunin, the original creator of Jython. For
more information, see `the IronPython website <http://www.ironpython.net/>`_.
more information, see `the IronPython website <http://ironpython.net/>`_.
PyPy
An implementation of Python written completely in Python. It supports several