[Python-checkins] cpython (merge 3.1 -> 3.2): Merge profile docs followup (#12417) from 3.1

Fri Jul 29 14:35:27 CEST 2011

http://hg.python.org/cpython/rev/0fbc56b53848
changeset: 71566:0fbc56b53848
branch: 3.2
parent: 71564:051eaec715bd
parent: 71565:1b3c21b12e92
user: Éric Araujo <merwok at netwok.org>
date: Thu Jul 28 23:00:14 2011 +0200
summary:
 Merge profile docs followup (#12417) from 3.1
files:
 Doc/library/profile.rst | 26 +-------------------------
 Doc/license.rst | 29 -----------------------------
 Lib/pstats.py | 4 ----
 3 files changed, 1 insertions(+), 58 deletions(-)

diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -39,7 +39,7 @@
 2. :mod:`profile`, a pure Python module whose interface is imitated by
 :mod:`cProfile`. Adds significant overhead to profiled programs. If you're
 trying to extend the profiler in some way, the task might be easier with this
- module. Copyright © 1994, by InfoSeek Corporation.
+ module.
 
 The :mod:`profile` and :mod:`cProfile` modules export the same interface, so
 they are mostly interchangeable; :mod:`cProfile` has a much lower overhead but
@@ -592,27 +592,3 @@
 functions should be used with care and should be as fast as possible. For the
 best results with a custom timer, it might be necessary to hard-code it in the C
 source of the internal :mod:`_lsprof` module.
-
-
-Copyright and License Notices
-=============================
-
-Copyright © 1994, by InfoSeek Corporation, all rights reserved.
-
-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.
diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -492,36 +492,6 @@
 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
 -----------------
 
diff --git a/Lib/pstats.py b/Lib/pstats.py
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -1,13 +1,9 @@
 """Class for printing reports on profiled python code."""
 
-# Class for printing reports on profiled python code. rev 1.0 4/1/94
-#
 # Written by James Roskind
 # Based on prior profile module by Sjoerd Mullender...
 # which was hacked somewhat by: Guido van Rossum
 
-"""Class for profiling Python code."""
-
 # Copyright Disney Enterprises, Inc. All Rights Reserved.
 # Licensed to PSF under a Contributor Agreement
 #
-- 
Repository URL: http://hg.python.org/cpython
