Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r52046:72c719815c26
Date: 2012-02-03 00:34 +0100
http://bitbucket.org/pypy/pypy/changeset/72c719815c26/
Log: Remove deprecated max_buffer_size from buffered IO. (and also the
slowest test in module/_io)
diff --git a/pypy/module/_io/interp_bufferedio.py
b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -74,10 +74,6 @@
def _check_init(self, space):
raise NotImplementedError
- def _deprecated_max_buffer_size(self, space):
- space.warn("max_buffer_size is deprecated",
- space.w_DeprecationWarning)
-
def read_w(self, space, w_size=None):
self._unsupportedoperation(space, "read")
@@ -821,12 +817,8 @@
)
class W_BufferedWriter(BufferedMixin, W_BufferedIOBase):
- @unwrap_spec(buffer_size=int, max_buffer_size=int)
- def descr_init(self, space, w_raw, buffer_size=DEFAULT_BUFFER_SIZE,
- max_buffer_size=-234):
- if max_buffer_size != -234:
- self._deprecated_max_buffer_size(space)
-
+ @unwrap_spec(buffer_size=int)
+ def descr_init(self, space, w_raw, buffer_size=DEFAULT_BUFFER_SIZE):
self.state = STATE_ZERO
check_writable_w(space, w_raw)
@@ -885,12 +877,9 @@
w_reader = None
w_writer = None
- @unwrap_spec(buffer_size=int, max_buffer_size=int)
- def descr_init(self, space, w_reader, w_writer,
- buffer_size=DEFAULT_BUFFER_SIZE, max_buffer_size=-234):
- if max_buffer_size != -234:
- self._deprecated_max_buffer_size(space)
-
+ @unwrap_spec(buffer_size=int)
+ def descr_init(self, space, w_reader, w_writer,
+ buffer_size=DEFAULT_BUFFER_SIZE):
try:
self.w_reader = W_BufferedReader(space)
self.w_reader.descr_init(space, w_reader, buffer_size)
@@ -943,12 +932,8 @@
)
class W_BufferedRandom(BufferedMixin, W_BufferedIOBase):
- @unwrap_spec(buffer_size=int, max_buffer_size=int)
- def descr_init(self, space, w_raw, buffer_size=DEFAULT_BUFFER_SIZE,
- max_buffer_size = -234):
- if max_buffer_size != -234:
- self._deprecated_max_buffer_size(space)
-
+ @unwrap_spec(buffer_size=int)
+ def descr_init(self, space, w_raw, buffer_size=DEFAULT_BUFFER_SIZE):
self.state = STATE_ZERO
check_readable_w(space, w_raw)
diff --git a/pypy/module/_io/test/test_bufferedio.py
b/pypy/module/_io/test/test_bufferedio.py
--- a/pypy/module/_io/test/test_bufferedio.py
+++ b/pypy/module/_io/test/test_bufferedio.py
@@ -255,17 +255,6 @@
raises(ValueError, b.flush)
raises(ValueError, b.close)
- def test_deprecated_max_buffer_size(self):
- import _io, warnings
- raw = _io.FileIO(self.tmpfile, 'w')
- with warnings.catch_warnings(record=True) as w:
- warnings.simplefilter("always")
- f = _io.BufferedWriter(raw, max_buffer_size=8192)
- f.close()
- assert len(w) == 1
- assert str(w[0].message) == "max_buffer_size is deprecated"
- assert w[0].category is DeprecationWarning
-
def test_check_several_writes(self):
import _io
raw = _io.FileIO(self.tmpfile, 'w')
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
