Mailman 3 January 2014 - Python-checkins

cpython: Typo fix
by andrew.kuchling Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/ffe73a516208 changeset: 88858:ffe73a516208 user: Andrew Kuchling <amk(a)amk.ca> date: Fri Jan 31 12:17:53 2014 -0500 summary: Typo fix files: Doc/whatsnew/3.4.rst | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -678,7 +678,7 @@ functools --------- -The new :func:`~functools.partialmethod` descriptor bring partial argument +The new :func:`~functools.partialmethod` descriptor brings partial argument application to descriptors, just as :func:`~functools.partial` provides for normal callables. The new descriptor also makes it easier to get arbitrary callables (including :func:`~functools.partial` instances) @@ -1624,4 +1624,3 @@ * The ``f_tstate`` (thread state) field of the :c:type:`PyFrameObject` structure has been removed to fix a bug: see :issue:`14432` for the rationale. - -- Repository URL: http://hg.python.org/cpython

1 0

cpython: The function name for cmath.isinf in PyArg_ParseTuple() was wrong.
by brett.cannon Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/4e30f327164a changeset: 88857:4e30f327164a user: Brett Cannon <brett(a)python.org> date: Fri Jan 31 12:04:36 2014 -0500 summary: The function name for cmath.isinf in PyArg_ParseTuple() was wrong. files: Misc/NEWS | 2 ++ Modules/cmathmodule.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,8 @@ Library ------- +- Fixed cmath.isinf's name in its argument parsing code. + - Issue #20311, #20452: poll and epoll now round the timeout away from zero, instead of rounding towards zero, in select and selectors modules: select.epoll.poll(), selectors.PollSelector.poll() and diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c --- a/Modules/cmathmodule.c +++ b/Modules/cmathmodule.c @@ -1060,7 +1060,7 @@ cmath_isinf(PyObject *self, PyObject *args) { Py_complex z; - if (!PyArg_ParseTuple(args, "D:isnan", &z)) + if (!PyArg_ParseTuple(args, "D:isinf", &z)) return NULL; return PyBool_FromLong(Py_IS_INFINITY(z.real) || Py_IS_INFINITY(z.imag)); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #20452: test_asyncio: Add more info if the test fails
by victor.stinner Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/7f649ff0756c changeset: 88856:7f649ff0756c user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jan 31 16:39:10 2014 +0100 summary: Issue #20452: test_asyncio: Add more info if the test fails files: Lib/test/test_asyncio/test_base_events.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -120,8 +120,13 @@ self.loop.call_at(when, cb) t0 = self.loop.time() self.loop.run_forever() - t1 = self.loop.time() - self.assertTrue(0.09 <= t1-t0 <= 0.9, t1-t0) + dt = self.loop.time() - t0 + self.assertTrue(0.09 <= dt <= 0.9, + # Issue #20452: add more info in case of failure, + # to try to investigate the bug + (dt, + self.loop._granularity, + time.get_clock_info('monotonic'))) def test_run_once_in_executor_handle(self): def cb(): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #20455: Add a resolution attribute to IocpProactor (1 ms)
by victor.stinner Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/55abd847c9f5 changeset: 88855:55abd847c9f5 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jan 31 16:26:38 2014 +0100 summary: Issue #20455: Add a resolution attribute to IocpProactor (1 ms) files: Lib/asyncio/proactor_events.py | 1 + Lib/asyncio/windows_events.py | 1 + Lib/test/test_asyncio/test_proactor_events.py | 2 ++ 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -354,6 +354,7 @@ self._selector = proactor # convenient alias self._self_reading_future = None self._accept_futures = {} # socket file descriptor => Future + self._granularity = max(proactor.resolution, self._granularity) proactor.set_loop(self) self._make_self_pipe() diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -191,6 +191,7 @@ self._cache = {} self._registered = weakref.WeakSet() self._stopped_serving = weakref.WeakSet() + self.resolution = 1e-3 def set_loop(self, loop): self._loop = loop diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py --- a/Lib/test/test_asyncio/test_proactor_events.py +++ b/Lib/test/test_asyncio/test_proactor_events.py @@ -17,6 +17,7 @@ def setUp(self): self.loop = test_utils.TestLoop() self.proactor = unittest.mock.Mock() + self.proactor.resolution = 1e-3 self.loop._proactor = self.proactor self.protocol = test_utils.make_test_protocol(asyncio.Protocol) self.sock = unittest.mock.Mock(socket.socket) @@ -342,6 +343,7 @@ def setUp(self): self.sock = unittest.mock.Mock(socket.socket) self.proactor = unittest.mock.Mock() + self.proactor.resolution = 1e-3 self.ssock, self.csock = unittest.mock.Mock(), unittest.mock.Mock() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #20455: asyncio: use the same code to round a timeout than the selectors
by victor.stinner Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/3f54bc5392c3 changeset: 88854:3f54bc5392c3 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jan 31 16:25:24 2014 +0100 summary: Issue #20455: asyncio: use the same code to round a timeout than the selectors module Sort also imports files: Lib/asyncio/windows_events.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -1,11 +1,12 @@ """Selector and proactor eventloops for Windows.""" +import _winapi import errno +import math import socket +import struct import subprocess import weakref -import struct -import _winapi from . import events from . import base_subprocess @@ -325,7 +326,9 @@ if timeout is None: ms = _winapi.INFINITE else: - ms = int(timeout * 1000 + 0.5) + # RegisterWaitForSingleObject() has a resolution of 1 millisecond, + # round away from zero to wait *at least* timeout seconds. + ms = math.ceil(timeout * 1e3) # We only create ov so we can use ov.address as a key for the cache. ov = _overlapped.Overlapped(NULL) @@ -396,7 +399,9 @@ elif timeout < 0: raise ValueError("negative timeout") else: - ms = int(timeout * 1000 + 0.5) + # GetQueuedCompletionStatus() has a resolution of 1 millisecond, + # round away from zero to wait *at least* timeout seconds. + ms = math.ceil(timeout * 1e3) if ms >= INFINITE: raise ValueError("timeout too big") while True: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #20455: math.ceil() returns an int in Python 3, no need to cast the
by victor.stinner Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/8fc69d43bc49 changeset: 88853:8fc69d43bc49 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jan 31 16:24:21 2014 +0100 summary: Issue #20455: math.ceil() returns an int in Python 3, no need to cast the result again to int files: Lib/selectors.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/selectors.py b/Lib/selectors.py --- a/Lib/selectors.py +++ b/Lib/selectors.py @@ -372,7 +372,7 @@ else: # poll() has a resolution of 1 millisecond, round away from # zero to wait *at least* timeout seconds. - timeout = int(math.ceil(timeout * 1e3)) + timeout = math.ceil(timeout * 1e3) ready = [] try: fd_event_list = self._poll.poll(timeout) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Windows buildbot: use --timeout feature in Tools/buildbot/test.bat
by victor.stinner Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/9a3e60b74cc7 changeset: 88852:9a3e60b74cc7 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jan 31 16:07:32 2014 +0100 summary: Windows buildbot: use --timeout feature in Tools/buildbot/test.bat Use the same default timeout than Makefile: 1 hour (3600 seconds). files: Tools/buildbot/test.bat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat --- a/Tools/buildbot/test.bat +++ b/Tools/buildbot/test.bat @@ -1,3 +1,3 @@ @rem Used by the buildbot "test" step. cd PCbuild -call rt.bat -d -q -uall -rwW -n %1 %2 %3 %4 %5 %6 %7 %8 %9 +call rt.bat -d -q -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9 -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #20390: Removing detritus from Argument Clinic "file preset" name change.
by larry.hastings Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/06b4fbb09c93 changeset: 88851:06b4fbb09c93 user: Larry Hastings <larry(a)hastings.org> date: Fri Jan 31 05:59:48 2014 -0800 summary: Issue #20390: Removing detritus from Argument Clinic "file preset" name change. files: Modules/_lzmamodule.clinic.c | 231 ----------------------- 1 files changed, 0 insertions(+), 231 deletions(-) diff --git a/Modules/_lzmamodule.clinic.c b/Modules/_lzmamodule.clinic.c deleted file mode 100644 --- a/Modules/_lzmamodule.clinic.c +++ /dev/null @@ -1,231 +0,0 @@ -/*[clinic input] -preserve -[clinic start generated code]*/ - -PyDoc_STRVAR(_lzma_LZMACompressor_compress__doc__, -"compress(self, data)\n" -"Provide data to the compressor object.\n" -"\n" -"Returns a chunk of compressed data if possible, or b\'\' otherwise.\n" -"\n" -"When you have finished providing data to the compressor, call the\n" -"flush() method to finish the compression process."); - -#define _LZMA_LZMACOMPRESSOR_COMPRESS_METHODDEF \ - {"compress", (PyCFunction)_lzma_LZMACompressor_compress, METH_VARARGS, _lzma_LZMACompressor_compress__doc__}, - -static PyObject * -_lzma_LZMACompressor_compress_impl(Compressor *self, Py_buffer *data); - -static PyObject * -_lzma_LZMACompressor_compress(Compressor *self, PyObject *args) -{ - PyObject *return_value = NULL; - Py_buffer data = {NULL, NULL}; - - if (!PyArg_ParseTuple(args, - "y*:compress", - &data)) - goto exit; - return_value = _lzma_LZMACompressor_compress_impl(self, &data); - -exit: - /* Cleanup for data */ - if (data.obj) - PyBuffer_Release(&data); - - return return_value; -} - -PyDoc_STRVAR(_lzma_LZMACompressor_flush__doc__, -"flush(self)\n" -"Finish the compression process.\n" -"\n" -"Returns the compressed data left in internal buffers.\n" -"\n" -"The compressor object may not be used after this method is called."); - -#define _LZMA_LZMACOMPRESSOR_FLUSH_METHODDEF \ - {"flush", (PyCFunction)_lzma_LZMACompressor_flush, METH_NOARGS, _lzma_LZMACompressor_flush__doc__}, - -static PyObject * -_lzma_LZMACompressor_flush_impl(Compressor *self); - -static PyObject * -_lzma_LZMACompressor_flush(Compressor *self, PyObject *Py_UNUSED(ignored)) -{ - return _lzma_LZMACompressor_flush_impl(self); -} - -PyDoc_STRVAR(_lzma_LZMADecompressor_decompress__doc__, -"decompress(self, data)\n" -"Provide data to the decompressor object.\n" -"\n" -"Returns a chunk of decompressed data if possible, or b\'\' otherwise.\n" -"\n" -"Attempting to decompress data after the end of stream is reached\n" -"raises an EOFError. Any data found after the end of the stream\n" -"is ignored and saved in the unused_data attribute."); - -#define _LZMA_LZMADECOMPRESSOR_DECOMPRESS_METHODDEF \ - {"decompress", (PyCFunction)_lzma_LZMADecompressor_decompress, METH_VARARGS, _lzma_LZMADecompressor_decompress__doc__}, - -static PyObject * -_lzma_LZMADecompressor_decompress_impl(Decompressor *self, Py_buffer *data); - -static PyObject * -_lzma_LZMADecompressor_decompress(Decompressor *self, PyObject *args) -{ - PyObject *return_value = NULL; - Py_buffer data = {NULL, NULL}; - - if (!PyArg_ParseTuple(args, - "y*:decompress", - &data)) - goto exit; - return_value = _lzma_LZMADecompressor_decompress_impl(self, &data); - -exit: - /* Cleanup for data */ - if (data.obj) - PyBuffer_Release(&data); - - return return_value; -} - -PyDoc_STRVAR(_lzma_LZMADecompressor___init____doc__, -"LZMADecompressor(format=FORMAT_AUTO, memlimit=None, filters=None)\n" -"Create a decompressor object for decompressing data incrementally.\n" -"\n" -" format\n" -" Specifies the container format of the input stream. If this is\n" -" FORMAT_AUTO (the default), the decompressor will automatically detect\n" -" whether the input is FORMAT_XZ or FORMAT_ALONE. Streams created with\n" -" FORMAT_RAW cannot be autodetected.\n" -" memlimit\n" -" Limit the amount of memory used by the decompressor. This will cause\n" -" decompression to fail if the input cannot be decompressed within the\n" -" given limit.\n" -" filters\n" -" A custom filter chain. This argument is required for FORMAT_RAW, and\n" -" not accepted with any other format. When provided, this should be a\n" -" sequence of dicts, each indicating the ID and options for a single\n" -" filter.\n" -"\n" -"For one-shot decompression, use the decompress() function instead."); - -static int -_lzma_LZMADecompressor___init___impl(Decompressor *self, int format, PyObject *memlimit, PyObject *filters); - -static int -_lzma_LZMADecompressor___init__(PyObject *self, PyObject *args, PyObject *kwargs) -{ - int return_value = -1; - static char *_keywords[] = {"format", "memlimit", "filters", NULL}; - int format = FORMAT_AUTO; - PyObject *memlimit = Py_None; - PyObject *filters = Py_None; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "|iOO:LZMADecompressor", _keywords, - &format, &memlimit, &filters)) - goto exit; - return_value = _lzma_LZMADecompressor___init___impl((Decompressor *)self, format, memlimit, filters); - -exit: - return return_value; -} - -PyDoc_STRVAR(_lzma_is_check_supported__doc__, -"is_check_supported(module, check_id)\n" -"Test whether the given integrity check is supported.\n" -"\n" -"Always returns True for CHECK_NONE and CHECK_CRC32."); - -#define _LZMA_IS_CHECK_SUPPORTED_METHODDEF \ - {"is_check_supported", (PyCFunction)_lzma_is_check_supported, METH_VARARGS, _lzma_is_check_supported__doc__}, - -static PyObject * -_lzma_is_check_supported_impl(PyModuleDef *module, int check_id); - -static PyObject * -_lzma_is_check_supported(PyModuleDef *module, PyObject *args) -{ - PyObject *return_value = NULL; - int check_id; - - if (!PyArg_ParseTuple(args, - "i:is_check_supported", - &check_id)) - goto exit; - return_value = _lzma_is_check_supported_impl(module, check_id); - -exit: - return return_value; -} - -PyDoc_STRVAR(_lzma__encode_filter_properties__doc__, -"_encode_filter_properties(module, filter)\n" -"Return a bytes object encoding the options (properties) of the filter specified by *filter* (a dict).\n" -"\n" -"The result does not include the filter ID itself, only the options."); - -#define _LZMA__ENCODE_FILTER_PROPERTIES_METHODDEF \ - {"_encode_filter_properties", (PyCFunction)_lzma__encode_filter_properties, METH_VARARGS, _lzma__encode_filter_properties__doc__}, - -static PyObject * -_lzma__encode_filter_properties_impl(PyModuleDef *module, lzma_filter filter); - -static PyObject * -_lzma__encode_filter_properties(PyModuleDef *module, PyObject *args) -{ - PyObject *return_value = NULL; - lzma_filter filter = {LZMA_VLI_UNKNOWN, NULL}; - - if (!PyArg_ParseTuple(args, - "O&:_encode_filter_properties", - lzma_filter_converter, &filter)) - goto exit; - return_value = _lzma__encode_filter_properties_impl(module, filter); - -exit: - /* Cleanup for filter */ - if (filter.id != LZMA_VLI_UNKNOWN) - PyMem_Free(filter.options); - - return return_value; -} - -PyDoc_STRVAR(_lzma__decode_filter_properties__doc__, -"_decode_filter_properties(module, filter_id, encoded_props)\n" -"Return a bytes object encoding the options (properties) of the filter specified by *filter* (a dict).\n" -"\n" -"The result does not include the filter ID itself, only the options."); - -#define _LZMA__DECODE_FILTER_PROPERTIES_METHODDEF \ - {"_decode_filter_properties", (PyCFunction)_lzma__decode_filter_properties, METH_VARARGS, _lzma__decode_filter_properties__doc__}, - -static PyObject * -_lzma__decode_filter_properties_impl(PyModuleDef *module, lzma_vli filter_id, Py_buffer *encoded_props); - -static PyObject * -_lzma__decode_filter_properties(PyModuleDef *module, PyObject *args) -{ - PyObject *return_value = NULL; - lzma_vli filter_id; - Py_buffer encoded_props = {NULL, NULL}; - - if (!PyArg_ParseTuple(args, - "O&y*:_decode_filter_properties", - lzma_vli_converter, &filter_id, &encoded_props)) - goto exit; - return_value = _lzma__decode_filter_properties_impl(module, filter_id, &encoded_props); - -exit: - /* Cleanup for encoded_props */ - if (encoded_props.obj) - PyBuffer_Release(&encoded_props); - - return return_value; -} -/*[clinic end generated code: output=b4b90dcbd0c9c349 input=a9049054013a1b77]*/ -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #20455: asyncio: write a new write pipe transport class for proactor (on
by victor.stinner Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/4c496d53b1e1 changeset: 88850:4c496d53b1e1 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jan 31 14:18:18 2014 +0100 summary: Issue #20455: asyncio: write a new write pipe transport class for proactor (on Windows) instead of using the "duplex" pipe transport. The new class uses a simpler overlapped read to be notified when the pipe is closed. So the protocol doesn't need to implement eof_received(): connection_lost() is called instead. _UnixWritePipeTransport has the same approach. files: Lib/asyncio/proactor_events.py | 38 +++++++++++++++------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -205,7 +205,7 @@ self.close() -class _ProactorWritePipeTransport(_ProactorBasePipeTransport, +class _ProactorBaseWritePipeTransport(_ProactorBasePipeTransport, transports.WriteTransport): """Transport for write pipes.""" @@ -286,8 +286,27 @@ self._force_close(None) +class _ProactorWritePipeTransport(_ProactorBaseWritePipeTransport): + def __init__(self, *args, **kw): + super().__init__(*args, **kw) + self._read_fut = self._loop._proactor.recv(self._sock, 16) + self._read_fut.add_done_callback(self._pipe_closed) + + def _pipe_closed(self, fut): + if fut.cancelled(): + # the transport has been closed + return + assert fut is self._read_fut, (fut, self._read_fut) + self._read_fut = None + assert fut.result() == b'' + if self._write_fut is not None: + self._force_close(exc) + else: + self.close() + + class _ProactorDuplexPipeTransport(_ProactorReadPipeTransport, - _ProactorWritePipeTransport, + _ProactorBaseWritePipeTransport, transports.Transport): """Transport for duplex pipes.""" @@ -299,7 +318,7 @@ class _ProactorSocketTransport(_ProactorReadPipeTransport, - _ProactorWritePipeTransport, + _ProactorBaseWritePipeTransport, transports.Transport): """Transport for connected sockets.""" @@ -353,15 +372,10 @@ return _ProactorReadPipeTransport(self, sock, protocol, waiter, extra) def _make_write_pipe_transport(self, sock, protocol, waiter=None, - extra=None, check_for_hangup=True): - if check_for_hangup: - # We want connection_lost() to be called when other end closes - return _ProactorDuplexPipeTransport(self, - sock, protocol, waiter, extra) - else: - # If other end closes we may not notice for a long time - return _ProactorWritePipeTransport(self, sock, protocol, waiter, - extra) + extra=None): + # We want connection_lost() to be called when other end closes + return _ProactorWritePipeTransport(self, + sock, protocol, waiter, extra) def close(self): if self._proactor is not None: -- Repository URL: http://hg.python.org/cpython

1 0

cpython: asyncio: Fix _UnixWritePipeTransport, raise BrokenPipeError when the pipe is
by victor.stinner Jan. 31, 2014

Jan. 31, 2014

http://hg.python.org/cpython/rev/b743d709b93b changeset: 88849:b743d709b93b user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Jan 31 13:04:28 2014 +0100 summary: asyncio: Fix _UnixWritePipeTransport, raise BrokenPipeError when the pipe is closed, but only if there was pending write files: Lib/asyncio/unix_events.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -283,7 +283,10 @@ def _read_ready(self): # Pipe was closed by peer. - self._close() + if self._buffer: + self._close(BrokenPipeError()) + else: + self._close() def write(self, data): assert isinstance(data, (bytes, bytearray, memoryview)), repr(data) -- Repository URL: http://hg.python.org/cpython

1 0