Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0bbacc6

Browse files
merwokmerwok
committed
Branch merge
2 parents abe9dc3 + bab50cb commit 0bbacc6

52 files changed

Lines changed: 256 additions & 294 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bzrignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ platform
1414
pybuilddir.txt
1515
pyconfig.h
1616
libpython*.a
17+
libpython*.so*
1718
python.exe
1819
python-gdb.py
1920
reflog.txt

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ build/
3737
config.log
3838
config.status
3939
libpython*.a
40+
libpython*.so*
4041
pybuilddir.txt
4142
pyconfig.h
4243
python

‎.hgignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@ PCbuild/amd64/
4141

4242
syntax: glob
4343
libpython*.a
44+
libpython*.so*
4445
*.swp
4546
*.o
4647
*.pyc
4748
*.pyo
4849
*.pyd
4950
*.cover
50-
*.orig
51-
*.rej
5251
*~
5352
Lib/lib2to3/*.pickle
5453
Lib/test/data/*

‎Doc/ACKS.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ [email protected]), and we'll be glad to correct the problem.
203203
* Kalle Svensson
204204
* Jim Tittsler
205205
* David Turner
206+
* Sandro Tosi
206207
* Ville Vainio
207208
* Nadeem Vawda
208209
* Martijn Vries

‎Doc/distutils/apiref.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and
7272
| | be built | :class:`distutils.core.Extension` |
7373
+--------------------+--------------------------------+-------------------------------------------------------------+
7474
| *classifiers* | A list of categories for the | The list of available |
75-
| | package | categorizations is at |
76-
| | | http://pypi.python.org/pypi?:action=list_classifiers. |
75+
| | package | categorizations is available on `PyPI |
76+
| | | <http://pypi.python.org/pypi?:action=list_classifiers>`_. |
7777
+--------------------+--------------------------------+-------------------------------------------------------------+
7878
| *distclass* | the :class:`Distribution` | A subclass of |
7979
| | class to use | :class:`distutils.core.Distribution` |

‎Doc/distutils/install.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ In that case, you would download the installer appropriate to your platform and
7272
do the obvious thing with it: run it if it's an executable installer, ``rpm
7373
--install`` it if it's an RPM, etc. You don't need to run Python or a setup
7474
script, you don't need to compile anything---you might not even need to read any
75-
instructions (although it's always a good idea to do so anyways).
75+
instructions (although it's always a good idea to do so anyway).
7676

7777
Of course, things will not always be that easy. You might be interested in a
7878
module distribution that doesn't have an easy-to-use installer for your

‎Doc/glossary.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,8 @@ Glossary
431431

432432
mapping
433433
A container object that supports arbitrary key lookups and implements the
434-
methods specified in the :class:`Mapping` or :class:`MutableMapping`
434+
methods specified in the :class:`~collections.Mapping` or
435+
:class:`~collections.MutableMapping`
435436
:ref:`abstract base classes <collections-abstract-base-classes>`. Examples
436437
include :class:`dict`, :class:`collections.defaultdict`,
437438
:class:`collections.OrderedDict` and :class:`collections.Counter`.

‎Doc/library/ossaudiodev.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ the standard audio interface for Linux and recent versions of FreeBSD.
1414
ALSA is in the standard kernel as of 2.5.x. Presumably if you
1515
use ALSA, you'll have to make sure its OSS compatibility layer
1616
is active to use ossaudiodev, but you're gonna need it for the vast
17-
majority of Linux audio apps anyways.
17+
majority of Linux audio apps anyway.
1818
1919
Sounds like things are also complicated for other BSDs. In response
2020
to my python-dev query, Thomas Wouters said:

‎Doc/library/packaging.dist.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ module distribution being built/packaged/distributed/installed.
6767
| | be built | :class:`packaging.compiler.extension.Extension` |
6868
+--------------------+--------------------------------+-------------------------------------------------------------+
6969
| *classifiers* | A list of categories for the | The list of available |
70-
| | distribution | categorizations is at |
71-
| | | http://pypi.python.org/pypi?:action=list_classifiers. |
70+
| | distribution | categorizations is available on `PyPI |
71+
| | | <http://pypi.python.org/pypi?:action=list_classifiers>`_. |
7272
+--------------------+--------------------------------+-------------------------------------------------------------+
7373
| *distclass* | the :class:`Distribution` | A subclass of |
7474
| | class to use | :class:`packaging.dist.Distribution` |

‎Doc/library/profile.rst‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The Python standard library provides two different profilers:
3939
2. :mod:`profile`, a pure Python module whose interface is imitated by
4040
:mod:`cProfile`. Adds significant overhead to profiled programs. If you're
4141
trying to extend the profiler in some way, the task might be easier with this
42-
module. Copyright © 1994, by InfoSeek Corporation.
42+
module.
4343

4444
The :mod:`profile` and :mod:`cProfile` modules export the same interface, so
4545
they are mostly interchangeable; :mod:`cProfile` has a much lower overhead but
@@ -592,27 +592,3 @@ The resulting profiler will then call :func:`your_time_func`.
592592
functions should be used with care and should be as fast as possible. For the
593593
best results with a custom timer, it might be necessary to hard-code it in the C
594594
source of the internal :mod:`_lsprof` module.
595-
596-
597-
Copyright and License Notices
598-
=============================
599-
600-
Copyright © 1994, by InfoSeek Corporation, all rights reserved.
601-
602-
Permission to use, copy, modify, and distribute this Python software and its
603-
associated documentation for any purpose (subject to the restriction in the
604-
following sentence) without fee is hereby granted, provided that the above
605-
copyright notice appears in all copies, and that both that copyright notice and
606-
this permission notice appear in supporting documentation, and that the name of
607-
InfoSeek not be used in advertising or publicity pertaining to distribution of
608-
the software without specific, written prior permission. This permission is
609-
explicitly restricted to the copying and modification of the software to remain
610-
in Python, compiled Python, or other languages (such as C) wherein the modified
611-
or derived code is exclusively imported into a Python module.
612-
613-
INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
614-
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
615-
SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
616-
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
617-
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
618-
OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

0 commit comments

Comments
 (0)