Mailman 3 December 2011 - Python-checkins

cpython: try to always use the old API
by benjamin.peterson Dec. 27, 2011

Dec. 27, 2011

http://hg.python.org/cpython/rev/4aa7b25f9509 changeset: 74188:4aa7b25f9509 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 27 16:01:21 2011 -0600 summary: try to always use the old API files: Modules/selectmodule.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1099,10 +1099,11 @@ if (fd == -1) { Py_BEGIN_ALLOW_THREADS #ifdef HAVE_EPOLL_CREATE1 - self->epfd = epoll_create1(flags); -#else + if (flags) + self->epfd = epoll_create1(flags); + else +#endif self->epfd = epoll_create(sizehint); -#endif Py_END_ALLOW_THREADS } else { @@ -1120,7 +1121,7 @@ static PyObject * pyepoll_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - int flags = 0, sizehint = 0; + int flags = 0, sizehint = FD_SETSIZE - 1; static char *kwlist[] = {"sizehint", "flags", NULL}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ii:epoll", kwlist, -- Repository URL: http://hg.python.org/cpython

1 0

cpython: fix for old kernels which don't have epoll_create1
by benjamin.peterson Dec. 27, 2011

Dec. 27, 2011

http://hg.python.org/cpython/rev/0f9276411dce changeset: 74187:0f9276411dce user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 27 15:36:32 2011 -0600 summary: fix for old kernels which don't have epoll_create1 files: Modules/selectmodule.c | 12 +++++++++--- configure | 29 +++++++++++++++++++++++++++-- configure.in | 6 ++++++ pyconfig.h.in | 3 +++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1087,7 +1087,7 @@ } static PyObject * -newPyEpoll_Object(PyTypeObject *type, int flags, SOCKET fd) +newPyEpoll_Object(PyTypeObject *type, int sizehint, int flags, SOCKET fd) { pyEpoll_Object *self; @@ -1098,7 +1098,11 @@ if (fd == -1) { Py_BEGIN_ALLOW_THREADS +#ifdef HAVE_EPOLL_CREATE1 self->epfd = epoll_create1(flags); +#else + self->epfd = epoll_create(sizehint); +#endif Py_END_ALLOW_THREADS } else { @@ -1127,7 +1131,7 @@ return NULL; } - return newPyEpoll_Object(type, flags, -1); + return newPyEpoll_Object(type, sizehint, flags, -1); } @@ -1185,7 +1189,7 @@ if (!PyArg_ParseTuple(args, "i:fromfd", &fd)) return NULL; - return newPyEpoll_Object((PyTypeObject*)cls, 0, fd); + return newPyEpoll_Object((PyTypeObject*)cls, FD_SETSIZE - 1, 0, fd); } PyDoc_STRVAR(pyepoll_fromfd_doc, @@ -2213,7 +2217,9 @@ PyModule_AddIntConstant(m, "EPOLLWRBAND", EPOLLWRBAND); PyModule_AddIntConstant(m, "EPOLLMSG", EPOLLMSG); +#ifdef EPOLL_CLOEXEC PyModule_AddIntConstant(m, "EPOLL_CLOEXEC", EPOLL_CLOEXEC); +#endif #endif /* HAVE_EPOLL */ #ifdef HAVE_KQUEUE diff --git a/configure b/configure --- a/configure +++ b/configure @@ -9606,6 +9606,31 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll_create1" >&5 +$as_echo_n "checking for epoll_create1... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/epoll.h> +int +main () +{ +void *x=epoll_create1 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_EPOLL_CREATE1 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5 $as_echo_n "checking for kqueue... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14564,8 +14589,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="`echo $ac_config_files`" -config_headers="`echo $ac_config_headers`" +config_files="$ac_config_files" +config_headers="$ac_config_headers" _ACEOF diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -2628,6 +2628,12 @@ AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) ]) +AC_MSG_CHECKING(for epoll_create1) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/epoll.h>]], [[void *x=epoll_create1]])], + [AC_DEFINE(HAVE_EPOLL_CREATE1, 1, Define if you have the 'epoll_create1' function.) + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no) +]) AC_MSG_CHECKING(for kqueue) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> diff --git a/pyconfig.h.in b/pyconfig.h.in --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -196,6 +196,9 @@ /* Define if you have the 'epoll' functions. */ #undef HAVE_EPOLL +/* Define if you have the 'epoll_create1' function. */ +#undef HAVE_EPOLL_CREATE1 + /* Define to 1 if you have the `erf' function. */ #undef HAVE_ERF -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): propgate error in other conditions
by benjamin.peterson Dec. 27, 2011

Dec. 27, 2011

http://hg.python.org/cpython/rev/e71e4bd45c89 changeset: 74185:e71e4bd45c89 branch: 2.7 parent: 74181:dc1045d08bd8 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 27 15:16:34 2011 -0600 summary: propgate error in other conditions files: Lib/test/test_epoll.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py --- a/Lib/test/test_epoll.py +++ b/Lib/test/test_epoll.py @@ -36,6 +36,7 @@ except IOError, e: if e.errno == errno.ENOSYS: raise unittest.SkipTest("kernel doesn't support epoll()") + raise class TestEPoll(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge 3.2
by benjamin.peterson Dec. 27, 2011

Dec. 27, 2011

http://hg.python.org/cpython/rev/0cae103a42d2 changeset: 74186:0cae103a42d2 parent: 74183:b30a94f7e053 parent: 74184:4964712a7269 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 27 15:17:15 2011 -0600 summary: merge 3.2 files: Lib/test/test_epoll.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py --- a/Lib/test/test_epoll.py +++ b/Lib/test/test_epoll.py @@ -36,6 +36,7 @@ except IOError as e: if e.errno == errno.ENOSYS: raise unittest.SkipTest("kernel doesn't support epoll()") + raise class TestEPoll(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): propgate error in other conditions
by benjamin.peterson Dec. 27, 2011

Dec. 27, 2011

http://hg.python.org/cpython/rev/4964712a7269 changeset: 74184:4964712a7269 branch: 3.2 parent: 74178:f0197f1d158e user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 27 15:16:34 2011 -0600 summary: propgate error in other conditions files: Lib/test/test_epoll.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py --- a/Lib/test/test_epoll.py +++ b/Lib/test/test_epoll.py @@ -36,6 +36,7 @@ except IOError as e: if e.errno == errno.ENOSYS: raise unittest.SkipTest("kernel doesn't support epoll()") + raise class TestEPoll(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: add a flags parameter to select.epoll
by benjamin.peterson Dec. 27, 2011

Dec. 27, 2011

http://hg.python.org/cpython/rev/b30a94f7e053 changeset: 74183:b30a94f7e053 user: Benjamin Peterson <benjamin(a)python.org> date: Tue Dec 27 15:15:41 2011 -0600 summary: add a flags parameter to select.epoll files: Doc/library/select.rst | 17 ++++++++++---- Lib/test/test_epoll.py | 2 + Misc/NEWS | 2 + Modules/selectmodule.c | 34 +++++++++++++---------------- 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/Doc/library/select.rst b/Doc/library/select.rst --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -39,12 +39,19 @@ .. versionadded:: 3.3 -.. function:: epoll(sizehint=-1) +.. function:: epoll(sizehint=-1, flags=0) - (Only supported on Linux 2.5.44 and newer.) Returns an edge polling object, - which can be used as Edge or Level Triggered interface for I/O events; see - section :ref:`epoll-objects` below for the methods supported by epolling - objects. + (Only supported on Linux 2.5.44 and newer.) Return an edge polling object, + which can be used as Edge or Level Triggered interface for I/O + events. *sizehint* is deprecated and completely ignored. *flags* can be set + to :const:`EPOLL_CLOEXEC`, which causes the epoll descriptor to be closed + automatically when :func:`os.execve` is called. See section + :ref:`epoll-objects` below for the methods supported by epolling objects. + + + .. versionchanged:: 3.3 + + Added the *flags* parameter. .. function:: poll() diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py --- a/Lib/test/test_epoll.py +++ b/Lib/test/test_epoll.py @@ -74,6 +74,8 @@ ep.close() self.assertTrue(ep.closed) self.assertRaises(ValueError, ep.fileno) + select.epoll(select.EPOLL_CLOEXEC).close() + self.assertRaises(OSError, select.epoll, flags=12356) def test_badcreate(self): self.assertRaises(TypeError, select.epoll, 1, 2, 3) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -422,6 +422,8 @@ Library ------- +- Add a flags parameter to select.epoll. + - Issue #12798: Updated the mimetypes documentation. - Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1087,20 +1087,10 @@ } static PyObject * -newPyEpoll_Object(PyTypeObject *type, int sizehint, SOCKET fd) +newPyEpoll_Object(PyTypeObject *type, int flags, SOCKET fd) { pyEpoll_Object *self; - if (sizehint == -1) { - sizehint = FD_SETSIZE-1; - } - else if (sizehint < 1) { - PyErr_Format(PyExc_ValueError, - "sizehint must be greater zero, got %d", - sizehint); - return NULL; - } - assert(type != NULL && type->tp_alloc != NULL); self = (pyEpoll_Object *) type->tp_alloc(type, 0); if (self == NULL) @@ -1108,7 +1098,7 @@ if (fd == -1) { Py_BEGIN_ALLOW_THREADS - self->epfd = epoll_create(sizehint); + self->epfd = epoll_create1(flags); Py_END_ALLOW_THREADS } else { @@ -1126,14 +1116,18 @@ static PyObject * pyepoll_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - int sizehint = -1; - static char *kwlist[] = {"sizehint", NULL}; + int flags = 0, sizehint = 0; + static char *kwlist[] = {"sizehint", "flags", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i:epoll", kwlist, - &sizehint)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ii:epoll", kwlist, + &sizehint, &flags)) return NULL; + if (sizehint < 0) { + PyErr_SetString(PyExc_ValueError, "negative sizehint"); + return NULL; + } - return newPyEpoll_Object(type, sizehint, -1); + return newPyEpoll_Object(type, flags, -1); } @@ -1191,7 +1185,7 @@ if (!PyArg_ParseTuple(args, "i:fromfd", &fd)) return NULL; - return newPyEpoll_Object((PyTypeObject*)cls, -1, fd); + return newPyEpoll_Object((PyTypeObject*)cls, 0, fd); } PyDoc_STRVAR(pyepoll_fromfd_doc, @@ -1420,7 +1414,7 @@ }; PyDoc_STRVAR(pyepoll_doc, -"select.epoll([sizehint=-1])\n\ +"select.epoll(sizehint=-1, flags=0)\n\ \n\ Returns an epolling object\n\ \n\ @@ -2218,6 +2212,8 @@ PyModule_AddIntConstant(m, "EPOLLWRNORM", EPOLLWRNORM); PyModule_AddIntConstant(m, "EPOLLWRBAND", EPOLLWRBAND); PyModule_AddIntConstant(m, "EPOLLMSG", EPOLLMSG); + + PyModule_AddIntConstant(m, "EPOLL_CLOEXEC", EPOLL_CLOEXEC); #endif /* HAVE_EPOLL */ #ifdef HAVE_KQUEUE -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (f0fcb82a88e9): sum=0
by solipsis＠pitrou.net Dec. 27, 2011

Dec. 27, 2011

results for f0fcb82a88e9 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogmoZHdh', '-x']

1 0

cpython: Ported some test cases from 2.7 for #11638
by jason.coombs Dec. 26, 2011

Dec. 26, 2011

http://hg.python.org/cpython/rev/f0fcb82a88e9 changeset: 74182:f0fcb82a88e9 parent: 74179:47f48553dd6b user: Jason R. Coombs <jaraco(a)jaraco.com> date: Mon Dec 26 12:17:01 2011 -0500 summary: Ported some test cases from 2.7 for #11638 files: Lib/distutils/tests/test_archive_util.py | 23 ++++++++++- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py --- a/Lib/distutils/tests/test_archive_util.py +++ b/Lib/distutils/tests/test_archive_util.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- """Tests for distutils.archive_util.""" import unittest import os @@ -32,6 +33,24 @@ @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run') def test_make_tarball(self): + self._make_tarball('archive') + + @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run') + def test_make_tarball_latin1(self): + """ + Mirror test_make_tarball, except filename contains latin characters. + """ + self._make_tarball('årchiv') # note this isn't a real word + + @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run') + def test_make_tarball_extended(self): + """ + Mirror test_make_tarball, except filename contains extended + characters outside the latin charset. + """ + self._make_tarball('のアーカイブ') # japanese for archive + + def _make_tarball(self, target_name): # creating something to tar tmpdir = self.mkdtemp() self.write_file([tmpdir, 'file1'], 'xxx') @@ -43,7 +62,7 @@ unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0], "Source and target should be on same drive") - base_name = os.path.join(tmpdir2, 'archive') + base_name = os.path.join(tmpdir2, target_name) # working with relative paths to avoid tar warnings old_dir = os.getcwd() @@ -58,7 +77,7 @@ self.assertTrue(os.path.exists(tarball)) # trying an uncompressed one - base_name = os.path.join(tmpdir2, 'archive') + base_name = os.path.join(tmpdir2, target_name) old_dir = os.getcwd() os.chdir(tmpdir) try: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #11638: Adding test to ensure .tar.gz files can be generated by sdist
by jason.coombs Dec. 26, 2011

Dec. 26, 2011

http://hg.python.org/cpython/rev/dc1045d08bd8 changeset: 74181:dc1045d08bd8 branch: 2.7 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Mon Dec 26 10:15:15 2011 -0500 summary: Issue #11638: Adding test to ensure .tar.gz files can be generated by sdist command with unicode metadata, based on David Barnett's patch. Issue #11638: Added tests to capture failures in make_tarball with various unicode strings. Following fix for Issue #13639, these tests now pass. files: Lib/distutils/tests/test_archive_util.py | 31 +++++++++++- Lib/distutils/tests/test_sdist.py | 22 ++++++++ Misc/NEWS | 3 + 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py --- a/Lib/distutils/tests/test_archive_util.py +++ b/Lib/distutils/tests/test_archive_util.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- """Tests for distutils.archive_util.""" __revision__ = "$Id$" @@ -40,6 +41,9 @@ @unittest.skipUnless(zlib, "requires zlib") def test_make_tarball(self): + self._make_tarball('archive') + + def _make_tarball(self, target_name): # creating something to tar tmpdir = self.mkdtemp() self.write_file([tmpdir, 'file1'], 'xxx') @@ -51,7 +55,7 @@ unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0], "source and target should be on same drive") - base_name = os.path.join(tmpdir2, 'archive') + base_name = os.path.join(tmpdir2, target_name) # working with relative paths to avoid tar warnings old_dir = os.getcwd() @@ -66,7 +70,7 @@ self.assertTrue(os.path.exists(tarball)) # trying an uncompressed one - base_name = os.path.join(tmpdir2, 'archive') + base_name = os.path.join(tmpdir2, target_name) old_dir = os.getcwd() os.chdir(tmpdir) try: @@ -277,6 +281,29 @@ finally: del ARCHIVE_FORMATS['xxx'] + @unittest.skipUnless(zlib, "requires zlib") + def test_make_tarball_unicode(self): + """ + Mirror test_make_tarball, except filename is unicode. + """ + self._make_tarball(u'archive') + + @unittest.skipUnless(zlib, "requires zlib") + def test_make_tarball_unicode_latin1(self): + """ + Mirror test_make_tarball, except filename is unicode and contains + latin characters. + """ + self._make_tarball(u'årchiv') # note this isn't a real word + + @unittest.skipUnless(zlib, "requires zlib") + def test_make_tarball_unicode_extended(self): + """ + Mirror test_make_tarball, except filename is unicode and contains + characters outside the latin charset. + """ + self._make_tarball(u'のアーカイブ') # japanese for archive + def test_suite(): return unittest.makeSuite(ArchiveUtilTestCase) diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -166,6 +166,28 @@ self.assertEqual(result, ['fake-1.0.tar', 'fake-1.0.tar.gz']) @unittest.skipUnless(zlib, "requires zlib") + def test_unicode_metadata_tgz(self): + """ + Unicode name or version should not break building to tar.gz format. + Reference issue #11638. + """ + + # create the sdist command with unicode parameters + dist, cmd = self.get_cmd({'name': u'fake', 'version': u'1.0'}) + + # create the sdist as gztar and run the command + cmd.formats = ['gztar'] + cmd.ensure_finalized() + cmd.run() + + # The command should have created the .tar.gz file + dist_folder = join(self.tmp_dir, 'dist') + result = os.listdir(dist_folder) + self.assertEqual(result, ['fake-1.0.tar.gz']) + + os.remove(join(dist_folder, 'fake-1.0.tar.gz')) + + @unittest.skipUnless(zlib, "requires zlib") def test_add_defaults(self): # http://bugs.python.org/issue2279 diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ Core and Builtins ----------------- +- Issue #11638: Unicode strings in 'name' and 'version' no longer cause + UnicodeDecodeErrors. + - Fix the fix for issue #12149: it was incorrect, although it had the side effect of appearing to resolve the issue. Thanks to Mark Shannon for noticing. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (47f48553dd6b): sum=0
by solipsis＠pitrou.net Dec. 26, 2011

Dec. 26, 2011

results for 47f48553dd6b on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogLaPv41', '-x']

1 0