Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r69919:50d426596929
Date: 2014-03-12 18:24 -0700
http://bitbucket.org/pypy/pypy/changeset/50d426596929/
Log: merge default
diff --git a/lib_pypy/audioop.py b/lib_pypy/audioop.py
--- a/lib_pypy/audioop.py
+++ b/lib_pypy/audioop.py
@@ -349,7 +349,7 @@
r_sample = getsample(cp, size, i + 1)
sample = (l_sample * fac1) + (r_sample * fac2)
- sample = clip(sample)
+ sample = int(clip(sample))
_put_sample(result, size, i // 2, sample)
@@ -500,7 +500,7 @@
# slice off extra bytes
trim_index = (out_i * bytes_per_frame) - len(retval)
- retval = _buffer(retval)[:trim_index]
+ retval = retval[:trim_index]
return (retval, (d, tuple(samps)))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
