[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/ff09a02ce029
changeset:   86019:ff09a02ce029
parent:      86017:399e46611fce
parent:      86018:9cd4d650d08b
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 10:11:48 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/ossaudiodev.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -302,7 +302,7 @@
 
       fmt = dsp.setfmt(fmt)
       channels = dsp.channels(channels)
-      rate = dsp.rate(channels)
+      rate = dsp.rate(rate)
 
 
 .. method:: oss_audio_device.bufsize()

-- 
Repository URL: http://hg.python.org/cpython