[Python-checkins] cpython (merge 3.3 -> default): #16683: merge with 3.3.
ezio.melotti
python-checkins at python.org
Fri Dec 14 19:20:29 CET 2012
http://hg.python.org/cpython/rev/f32f67d26035
changeset: 80853:f32f67d26035
parent: 80849:39263bb0ef4c
parent: 80852:a1ffb6c68711
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Dec 14 20:20:07 2012 +0200
summary:
#16683: merge with 3.3.
files:
Doc/library/audioop.rst | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Doc/library/audioop.rst b/Doc/library/audioop.rst
--- a/Doc/library/audioop.rst
+++ b/Doc/library/audioop.rst
@@ -156,22 +156,22 @@
hardware, among others.
+.. function:: max(fragment, width)
+
+ Return the maximum of the *absolute value* of all samples in a fragment.
+
+
+.. function:: maxpp(fragment, width)
+
+ Return the maximum peak-peak value in the sound fragment.
+
+
.. function:: minmax(fragment, width)
Return a tuple consisting of the minimum and maximum values of all samples in
the sound fragment.
-.. function:: max(fragment, width)
-
- Return the maximum of the *absolute value* of all samples in a fragment.
-
-
-.. function:: maxpp(fragment, width)
-
- Return the maximum peak-peak value in the sound fragment.
-
-
.. function:: mul(fragment, width, factor)
Return a fragment that has all samples in the original fragment multiplied by
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list