Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3.3
Changeset: r81958:18cc712aac9b
Date: 2016-01-26 22:52 +0100
http://bitbucket.org/pypy/pypy/changeset/18cc712aac9b/
Log: io.BufferedWriter: completely remove max_buffer_size argument.
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
@@ -91,10 +91,6 @@
rwbuffer.setslice(0, data)
return space.wrap(len(data))
- def _complain_about_max_buffer_size(self, space):
- space.warn(space.wrap("max_buffer_size is deprecated"),
- space.w_DeprecationWarning)
-
W_BufferedIOBase.typedef = TypeDef(
'_io._BufferedIOBase', W_IOBase.typedef,
__new__ = generic_new_descr(W_BufferedIOBase),
@@ -888,11 +884,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._complain_about_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)
@@ -954,12 +947,10 @@
w_reader = None
w_writer = None
- @unwrap_spec(buffer_size=int, max_buffer_size=int)
+ @unwrap_spec(buffer_size=int)
def descr_init(self, space, w_reader, w_writer,
- buffer_size=DEFAULT_BUFFER_SIZE, max_buffer_size=-234):
+ buffer_size=DEFAULT_BUFFER_SIZE):
try:
- if max_buffer_size != -234:
- self._complain_about_max_buffer_size(space)
self.w_reader = W_BufferedReader(space)
self.w_reader.descr_init(space, w_reader, buffer_size)
self.w_writer = W_BufferedWriter(space)
@@ -1029,12 +1020,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._complain_about_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)
check_writable_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
@@ -749,28 +749,17 @@
raises(TypeError, f.readline, 5.3)
-class AppTestDeprecation:
+class AppTestMaxBuffer:
- def w_check_max_buffer_size_deprecation(self, test):
+ def w_check_max_buffer_size_removal(self, test):
import _io
- import _warnings
- def simplefilter(action, category):
- _warnings.filters.insert(0, (action, None, category, None, 0))
- simplefilter('error', DeprecationWarning)
- try:
- test(_io.BytesIO(), 8, 12)
- except DeprecationWarning as e:
- assert 'max_buffer_size is deprecated' in str(e)
- else:
- assert False, 'Expected DeprecationWarning'
- finally:
- simplefilter('default', DeprecationWarning)
+ raises(TypeError, test, _io.BytesIO(), 8, 12)
- def test_max_buffer_size_deprecation(self):
+ def test_max_buffer_size_removal(self):
import _io
- self.check_max_buffer_size_deprecation(_io.BufferedWriter)
- self.check_max_buffer_size_deprecation(_io.BufferedRandom)
- self.check_max_buffer_size_deprecation(
+ self.check_max_buffer_size_removal(_io.BufferedWriter)
+ self.check_max_buffer_size_removal(_io.BufferedRandom)
+ self.check_max_buffer_size_removal (
lambda raw, *args: _io.BufferedRWPair(raw, raw, *args))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
