diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-07-29 01:11:09 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-07-29 01:11:09 (GMT) |
| commit | 2527796a22404d5b8cb0e498a965c6b4a743caac (patch) | |
| tree | 5bc07b91dde0085cc09c3336ed740f6817f11fc3 /Doc/license.rst | |
| parent | 1e3a68d36b08cd9d59084a37c8cb6c2d911868ce (diff) | |
| parent | cf534817adc49b2562d175fabd3e3992d25063fe (diff) | |
| download | cpython-2527796a22404d5b8cb0e498a965c6b4a743caac.zip cpython-2527796a22404d5b8cb0e498a965c6b4a743caac.tar.gz cpython-2527796a22404d5b8cb0e498a965c6b4a743caac.tar.bz2 | |
Merge from 3.2 (#10318, #12255, #12043, #12417 and other fixes)
Diffstat (limited to 'Doc/license.rst')
| -rw-r--r-- | Doc/license.rst | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 615b18c..d0b370f 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -494,36 +494,6 @@ The :mod:`http.cookies` module contains the following notice:: PERFORMANCE OF THIS SOFTWARE. -Profiling ---------- - -The :mod:`profile` and :mod:`pstats` modules contain the following notice:: - - Copyright 1994, by InfoSeek Corporation, all rights reserved. - Written by James Roskind - - Permission to use, copy, modify, and distribute this Python software - and its associated documentation for any purpose (subject to the - restriction in the following sentence) without fee is hereby granted, - provided that the above copyright notice appears in all copies, and - that both that copyright notice and this permission notice appear in - supporting documentation, and that the name of InfoSeek not be used in - advertising or publicity pertaining to distribution of the software - without specific, written prior permission. This permission is - explicitly restricted to the copying and modification of the software - to remain in Python, compiled Python, or other languages (such as C) - wherein the modified or derived code is exclusively imported into a - Python module. - - INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY - SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - Execution tracing ----------------- |