Mailman 3 February 2011 - Python-checkins

devinabox: Add a Python script which will run the test suite in the most rigorous way
by brett.cannon 01 Mar '11

01 Mar '11

brett.cannon pushed 3e5a61adb41d to devinabox: http://hg.python.org/devinabox/rev/3e5a61adb41d changeset: 8:3e5a61adb41d user: Brett Cannon <brett(a)python.org> date: Fri Feb 25 17:35:37 2011 -0800 summary: Add a Python script which will run the test suite in the most rigorous way possible. files: run_tests.py diff --git a/run_tests.py b/run_tests.py new file mode 100644 --- /dev/null +++ b/run_tests.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python +"""Run CPython's test suite in the most rigorous way possible.""" +import multiprocessing +import os +import subprocess +import sys + + +directory = 'cpython' +cmd = os.path.join(directory, 'python') +# UNIX +if not os.path.isfile(cmd): + # OS X + cmd += '.exe' + if not os.path.isfile(cmd): + # 32-bit Windows + cmd = os.path.join(directory, 'PCBuild', 'python_d.exe') + if not os.path.isfile(cmd): + # 64-bit Windows + cmd = os.path.join(directory, 'PCBuild', 'AMD64', 'python_d.exe') + if not os.path.isfile(cmd): + print('CPython is not built') + sys.exit(1) + +subprocess.call([cmd, '-W', 'default', '-bb', '-E', '-m', 'test', '-r', '-w', + '-u', 'all', '-j', str(multiprocessing.cpu_count())]) -- Repository URL: http://hg.python.org/devinabox

2 1

r88689 - in python/branches/release31-maint: Lib/test/support.py Lib/test/test_mmap.py Lib/test/test_zlib.py Misc/NEWS Modules/mmapmodule.c Modules/zlibmodule.c
by antoine.pitrou 28 Feb '11

28 Feb '11

Author: antoine.pitrou Date: Tue Mar 1 00:48:16 2011 New Revision: 88689 Log: Merged revisions 88460,88464,88466,88486,88511,88652 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88460 | antoine.pitrou | 2011-02-21 19:03:13 +0100 (lun., 21 févr. 2011) | 4 lines Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers larger than 4GB. Patch by Nadeem Vawda. ........ r88464 | antoine.pitrou | 2011-02-21 20:05:08 +0100 (lun., 21 févr. 2011) | 3 lines Fix issues on 32-bit systems introduced by r88460 ........ r88466 | antoine.pitrou | 2011-02-21 20:28:40 +0100 (lun., 21 févr. 2011) | 3 lines Fix compile error under MSVC introduced by r88460. ........ r88486 | antoine.pitrou | 2011-02-22 00:41:12 +0100 (mar., 22 févr. 2011) | 5 lines Issue #4681: Allow mmap() to work on file sizes and offsets larger than 4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for 32-bit Windows. ........ r88511 | antoine.pitrou | 2011-02-22 22:42:56 +0100 (mar., 22 févr. 2011) | 4 lines Issue #11277: finally fix Snow Leopard crash following r88460. (probably an OS-related issue with mmap) ........ r88652 | antoine.pitrou | 2011-02-26 16:58:05 +0100 (sam., 26 févr. 2011) | 4 lines Issue #9931: Fix hangs in GUI tests under Windows in certain conditions. Patch by Hirokazu Yamamoto. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/test/support.py python/branches/release31-maint/Lib/test/test_mmap.py python/branches/release31-maint/Lib/test/test_zlib.py python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Modules/mmapmodule.c python/branches/release31-maint/Modules/zlibmodule.c Modified: python/branches/release31-maint/Lib/test/support.py ============================================================================== --- python/branches/release31-maint/Lib/test/support.py (original) +++ python/branches/release31-maint/Lib/test/support.py Tue Mar 1 00:48:16 2011 @@ -198,6 +198,36 @@ # is exited) but there is a .pyo file. unlink(os.path.join(dirname, modname + '.pyo')) +# On some platforms, should not run gui test even if it is allowed +# in `use_resources'. +if sys.platform.startswith('win'): + import ctypes + import ctypes.wintypes + def _is_gui_available(): + UOI_FLAGS = 1 + WSF_VISIBLE = 0x0001 + class USEROBJECTFLAGS(ctypes.Structure): + _fields_ = [("fInherit", ctypes.wintypes.BOOL), + ("fReserved", ctypes.wintypes.BOOL), + ("dwFlags", ctypes.wintypes.DWORD)] + dll = ctypes.windll.user32 + h = dll.GetProcessWindowStation() + if not h: + raise ctypes.WinError() + uof = USEROBJECTFLAGS() + needed = ctypes.wintypes.DWORD() + res = dll.GetUserObjectInformationW(h, + UOI_FLAGS, + ctypes.byref(uof), + ctypes.sizeof(uof), + ctypes.byref(needed)) + if not res: + raise ctypes.WinError() + return bool(uof.dwFlags & WSF_VISIBLE) +else: + def _is_gui_available(): + return True + def is_resource_enabled(resource): """Test whether a resource is enabled. Known resources are set by regrtest.py.""" @@ -208,6 +238,8 @@ If the caller's module is __main__ then automatically return True. The possibility of False being returned occurs when regrtest.py is executing.""" + if resource == 'gui' and not _is_gui_available(): + raise unittest.SkipTest("Cannot use the 'gui' resource") # see if the caller's module is __main__ - if so, treat as if # the resource was set if sys._getframe(1).f_globals.get("__name__") == "__main__": @@ -869,6 +901,8 @@ return obj def requires_resource(resource): + if resource == 'gui' and not _is_gui_available(): + return unittest.skip("resource 'gui' is not available") if is_resource_enabled(resource): return _id else: Modified: python/branches/release31-maint/Lib/test/test_mmap.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_mmap.py (original) +++ python/branches/release31-maint/Lib/test/test_mmap.py Tue Mar 1 00:48:16 2011 @@ -1,6 +1,6 @@ -from test.support import TESTFN, run_unittest, import_module +from test.support import TESTFN, run_unittest, import_module, unlink, requires import unittest -import os, re, itertools, socket +import os, re, itertools, socket, sys # Skip test if we can't import mmap. mmap = import_module('mmap') @@ -636,8 +636,63 @@ finally: s.close() + +class LargeMmapTests(unittest.TestCase): + + def setUp(self): + unlink(TESTFN) + + def tearDown(self): + unlink(TESTFN) + + def _working_largefile(self): + # Only run if the current filesystem supports large files. + f = open(TESTFN, 'wb', buffering=0) + try: + f.seek(0x80000001) + f.write(b'x') + f.flush() + except (IOError, OverflowError): + raise unittest.SkipTest("filesystem does not have largefile support") + finally: + f.close() + unlink(TESTFN) + + def test_large_offset(self): + if sys.platform[:3] == 'win' or sys.platform == 'darwin': + requires('largefile', + 'test requires %s bytes and a long time to run' % str(0x180000000)) + self._working_largefile() + with open(TESTFN, 'wb') as f: + f.seek(0x14FFFFFFF) + f.write(b" ") + + with open(TESTFN, 'rb') as f: + m = mmap.mmap(f.fileno(), 0, offset=0x140000000, access=mmap.ACCESS_READ) + try: + self.assertEqual(m[0xFFFFFFF], 32) + finally: + m.close() + + def test_large_filesize(self): + if sys.platform[:3] == 'win' or sys.platform == 'darwin': + requires('largefile', + 'test requires %s bytes and a long time to run' % str(0x180000000)) + self._working_largefile() + with open(TESTFN, 'wb') as f: + f.seek(0x17FFFFFFF) + f.write(b" ") + + with open(TESTFN, 'rb') as f: + m = mmap.mmap(f.fileno(), 0x10000, access=mmap.ACCESS_READ) + try: + self.assertEqual(m.size(), 0x180000000) + finally: + m.close() + + def test_main(): - run_unittest(MmapTests) + run_unittest(MmapTests, LargeMmapTests) if __name__ == '__main__': test_main() Modified: python/branches/release31-maint/Lib/test/test_zlib.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_zlib.py (original) +++ python/branches/release31-maint/Lib/test/test_zlib.py Tue Mar 1 00:48:16 2011 @@ -2,10 +2,16 @@ from test import support import binascii import random -from test.support import precisionbigmemtest, _1G +import sys +from test.support import precisionbigmemtest, _1G, _4G zlib = support.import_module('zlib') +try: + import mmap +except ImportError: + mmap = None + class ChecksumTestCase(unittest.TestCase): # checksum test cases @@ -57,6 +63,28 @@ self.assertEqual(binascii.crc32(b'spam'), zlib.crc32(b'spam')) +# Issue #10276 - check that inputs >=4GB are handled correctly. +class ChecksumBigBufferTestCase(unittest.TestCase): + + def setUp(self): + with open(support.TESTFN, "wb+") as f: + f.seek(_4G) + f.write(b"asdf") + with open(support.TESTFN, "rb") as f: + self.mapping = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) + + def tearDown(self): + self.mapping.close() + support.unlink(support.TESTFN) + + @unittest.skipUnless(mmap, "mmap() is not available.") + @unittest.skipUnless(sys.maxsize > _4G, "Can't run on a 32-bit system.") + @unittest.skipUnless(support.is_resource_enabled("largefile"), + "May use lots of disk space.") + def test_big_buffer(self): + self.assertEqual(zlib.crc32(self.mapping), 3058686908) + self.assertEqual(zlib.adler32(self.mapping), 82837919) + class ExceptionTestCase(unittest.TestCase): # make sure we generate some expected errors @@ -567,6 +595,7 @@ def test_main(): support.run_unittest( ChecksumTestCase, + ChecksumBigBufferTestCase, ExceptionTestCase, CompressTestCase, CompressObjectTestCase Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Tue Mar 1 00:48:16 2011 @@ -37,6 +37,13 @@ Library ------- +- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers + larger than 4GB. Patch by Nadeem Vawda. + +- Issue #4681: Allow mmap() to work on file sizes and offsets larger than + 4GB, even on 32-bit builds. Initial patch by Ross Lagerwall, adapted for + 32-bit Windows. + - email.header.Header was incorrectly encoding folding white space when rfc2047-encoding header values with embedded newlines, leaving them without folding whitespace. It now uses the continuation_ws, as it Modified: python/branches/release31-maint/Modules/mmapmodule.c ============================================================================== --- python/branches/release31-maint/Modules/mmapmodule.c (original) +++ python/branches/release31-maint/Modules/mmapmodule.c Tue Mar 1 00:48:16 2011 @@ -90,7 +90,11 @@ char * data; size_t size; size_t pos; /* relative to offset */ - size_t offset; +#ifdef MS_WINDOWS + PY_LONG_LONG offset; +#else + off_t offset; +#endif int exports; #ifdef MS_WINDOWS @@ -435,7 +439,11 @@ PyErr_SetFromErrno(mmap_module_error); return NULL; } - return PyLong_FromSsize_t(buf.st_size); +#ifdef HAVE_LARGEFILE_SUPPORT + return PyLong_FromLongLong(buf.st_size); +#else + return PyLong_FromLong(buf.st_size); +#endif } #endif /* UNIX */ } @@ -469,17 +477,10 @@ CloseHandle(self->map_handle); self->map_handle = NULL; /* Move to the desired EOF position */ -#if SIZEOF_SIZE_T > 4 newSizeHigh = (DWORD)((self->offset + new_size) >> 32); newSizeLow = (DWORD)((self->offset + new_size) & 0xFFFFFFFF); off_hi = (DWORD)(self->offset >> 32); off_lo = (DWORD)(self->offset & 0xFFFFFFFF); -#else - newSizeHigh = 0; - newSizeLow = (DWORD)(self->offset + new_size); - off_hi = 0; - off_lo = (DWORD)self->offset; -#endif SetFilePointer(self->file_handle, newSizeLow, &newSizeHigh, FILE_BEGIN); /* Change the size of the file */ @@ -1020,6 +1021,12 @@ } #ifdef UNIX +#ifdef HAVE_LARGEFILE_SUPPORT +#define _Py_PARSE_OFF_T "L" +#else +#define _Py_PARSE_OFF_T "l" +#endif + static PyObject * new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) { @@ -1027,8 +1034,9 @@ struct stat st; #endif mmap_object *m_obj; - PyObject *map_size_obj = NULL, *offset_obj = NULL; - Py_ssize_t map_size, offset; + PyObject *map_size_obj = NULL; + Py_ssize_t map_size; + off_t offset = 0; int fd, flags = MAP_SHARED, prot = PROT_WRITE | PROT_READ; int devzero = -1; int access = (int)ACCESS_DEFAULT; @@ -1036,16 +1044,18 @@ "flags", "prot", "access", "offset", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iO|iiiO", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iO|iii" _Py_PARSE_OFF_T, keywords, &fd, &map_size_obj, &flags, &prot, - &access, &offset_obj)) + &access, &offset)) return NULL; map_size = _GetMapSize(map_size_obj, "size"); if (map_size < 0) return NULL; - offset = _GetMapSize(offset_obj, "offset"); - if (offset < 0) + if (offset < 0) { + PyErr_SetString(PyExc_OverflowError, + "memory mapped offset must be positive"); return NULL; + } if ((access != (int)ACCESS_DEFAULT) && ((flags != MAP_SHARED) || (prot != (PROT_WRITE | PROT_READ)))) @@ -1090,8 +1100,14 @@ "mmap offset is greater than file size"); return NULL; } - map_size = st.st_size - offset; - } else if ((size_t)offset + (size_t)map_size > st.st_size) { + off_t calc_size = st.st_size - offset; + map_size = calc_size; + if (map_size != calc_size) { + PyErr_SetString(PyExc_ValueError, + "mmap length is too large"); + return NULL; + } + } else if (offset + (size_t)map_size > st.st_size) { PyErr_SetString(PyExc_ValueError, "mmap length is greater than file size"); return NULL; @@ -1152,12 +1168,19 @@ #endif /* UNIX */ #ifdef MS_WINDOWS + +/* A note on sizes and offsets: while the actual map size must hold in a + Py_ssize_t, both the total file size and the start offset can be longer + than a Py_ssize_t, so we use PY_LONG_LONG which is always 64-bit. +*/ + static PyObject * new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) { mmap_object *m_obj; - PyObject *map_size_obj = NULL, *offset_obj = NULL; - Py_ssize_t map_size, offset; + PyObject *map_size_obj = NULL; + Py_ssize_t map_size; + PY_LONG_LONG offset = 0, size; DWORD off_hi; /* upper 32 bits of offset */ DWORD off_lo; /* lower 32 bits of offset */ DWORD size_hi; /* upper 32 bits of size */ @@ -1172,9 +1195,9 @@ "tagname", "access", "offset", NULL }; - if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iO|ziO", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kwdict, "iO|ziL", keywords, &fileno, &map_size_obj, - &tagname, &access, &offset_obj)) { + &tagname, &access, &offset)) { return NULL; } @@ -1199,9 +1222,11 @@ map_size = _GetMapSize(map_size_obj, "size"); if (map_size < 0) return NULL; - offset = _GetMapSize(offset_obj, "offset"); - if (offset < 0) + if (offset < 0) { + PyErr_SetString(PyExc_OverflowError, + "memory mapped offset must be positive"); return NULL; + } /* assume -1 and 0 both mean invalid filedescriptor to 'anonymously' map memory. @@ -1265,28 +1290,26 @@ return PyErr_SetFromWindowsErr(dwErr); } -#if SIZEOF_SIZE_T > 4 - m_obj->size = (((size_t)high)<<32) + low; -#else - if (high) - /* File is too large to map completely */ - m_obj->size = (size_t)-1; - else - m_obj->size = low; -#endif - if (offset >= m_obj->size) { + size = (((PY_LONG_LONG) high) << 32) + low; + if (offset >= size) { PyErr_SetString(PyExc_ValueError, "mmap offset is greater than file size"); Py_DECREF(m_obj); return NULL; } - m_obj->size -= offset; + if (offset - size > PY_SSIZE_T_MAX) + /* Map area too large to fit in memory */ + m_obj->size = (Py_ssize_t) -1; + else + m_obj->size = (Py_ssize_t) (size - offset); } else { m_obj->size = map_size; + size = offset + map_size; } } else { m_obj->size = map_size; + size = offset + map_size; } /* set the initial position */ @@ -1307,22 +1330,10 @@ m_obj->tagname = NULL; m_obj->access = (access_mode)access; - /* DWORD is a 4-byte int. If we're on a box where size_t consumes - * more than 4 bytes, we need to break it apart. Else (size_t - * consumes 4 bytes), C doesn't define what happens if we shift - * right by 32, so we need different code. - */ -#if SIZEOF_SIZE_T > 4 - size_hi = (DWORD)((offset + m_obj->size) >> 32); - size_lo = (DWORD)((offset + m_obj->size) & 0xFFFFFFFF); + size_hi = (DWORD)(size >> 32); + size_lo = (DWORD)(size & 0xFFFFFFFF); off_hi = (DWORD)(offset >> 32); off_lo = (DWORD)(offset & 0xFFFFFFFF); -#else - size_hi = 0; - size_lo = (DWORD)(offset + m_obj->size); - off_hi = 0; - off_lo = (DWORD)offset; -#endif /* For files, it would be sufficient to pass 0 as size. For anonymous maps, we have to pass the size explicitly. */ m_obj->map_handle = CreateFileMapping(m_obj->file_handle, Modified: python/branches/release31-maint/Modules/zlibmodule.c ============================================================================== --- python/branches/release31-maint/Modules/zlibmodule.c (original) +++ python/branches/release31-maint/Modules/zlibmodule.c Tue Mar 1 00:48:16 2011 @@ -931,8 +931,18 @@ /* Releasing the GIL for very small buffers is inefficient and may lower performance */ if (pbuf.len > 1024*5) { + unsigned char *buf = pbuf.buf; + Py_ssize_t len = pbuf.len; + Py_BEGIN_ALLOW_THREADS - adler32val = adler32(adler32val, pbuf.buf, pbuf.len); + /* Avoid truncation of length for very large buffers. adler32() takes + length as an unsigned int, which may be narrower than Py_ssize_t. */ + while (len > (size_t) UINT_MAX) { + adler32val = adler32(adler32val, buf, UINT_MAX); + buf += (size_t) UINT_MAX; + len -= (size_t) UINT_MAX; + } + adler32val = adler32(adler32val, buf, len); Py_END_ALLOW_THREADS } else { adler32val = adler32(adler32val, pbuf.buf, pbuf.len); @@ -959,8 +969,18 @@ /* Releasing the GIL for very small buffers is inefficient and may lower performance */ if (pbuf.len > 1024*5) { + unsigned char *buf = pbuf.buf; + Py_ssize_t len = pbuf.len; + Py_BEGIN_ALLOW_THREADS - signed_val = crc32(crc32val, pbuf.buf, pbuf.len); + /* Avoid truncation of length for very large buffers. crc32() takes + length as an unsigned int, which may be narrower than Py_ssize_t. */ + while (len > (size_t) UINT_MAX) { + crc32val = crc32(crc32val, buf, UINT_MAX); + buf += (size_t) UINT_MAX; + len -= (size_t) UINT_MAX; + } + signed_val = crc32(crc32val, buf, len); Py_END_ALLOW_THREADS } else { signed_val = crc32(crc32val, pbuf.buf, pbuf.len);

1 0

r88688 - python/branches/pep-382
by martin.v.loewis 28 Feb '11

28 Feb '11

Author: martin.v.loewis Date: Tue Mar 1 00:18:02 2011 New Revision: 88688 Log: Initialized merge tracking via "svnmerge" with revisions "1-85195" from svn+ssh://pythondev@svn.python.org/python/branches/py3k Modified: python/branches/pep-382/ (props changed)

1 0

r88687 - in python/branches/release32-maint: Doc/library/socket.rst
by antoine.pitrou 28 Feb '11

28 Feb '11

Author: antoine.pitrou Date: Tue Mar 1 00:03:28 2011 New Revision: 88687 Log: Merged revisions 88686 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88686 | antoine.pitrou | 2011-02-28 23:38:07 +0100 (lun., 28 févr. 2011) | 4 lines Recommend inspecting the errno attribute of socket.error objects, and improve wording. ........ Modified: python/branches/release32-maint/ (props changed) python/branches/release32-maint/Doc/library/socket.rst Modified: python/branches/release32-maint/Doc/library/socket.rst ============================================================================== --- python/branches/release32-maint/Doc/library/socket.rst (original) +++ python/branches/release32-maint/Doc/library/socket.rst Tue Mar 1 00:03:28 2011 @@ -117,39 +117,44 @@ .. index:: module: errno - This exception is raised for socket-related errors. The accompanying value is - either a string telling what went wrong or a pair ``(errno, string)`` - representing an error returned by a system call, similar to the value - accompanying :exc:`os.error`. See the module :mod:`errno`, which contains names - for the error codes defined by the underlying operating system. + A subclass of :exc:`IOError`, this exception is raised for socket-related + errors. It is recommended that you inspect its ``errno`` attribute to + discriminate between different kinds of errors. + + .. seealso:: + The :mod:`errno` module contains symbolic names for the error codes + defined by the underlying operating system. .. exception:: herror - This exception is raised for address-related errors, i.e. for functions that use - *h_errno* in the C API, including :func:`gethostbyname_ex` and - :func:`gethostbyaddr`. - - The accompanying value is a pair ``(h_errno, string)`` representing an error - returned by a library call. *string* represents the description of *h_errno*, as - returned by the :c:func:`hstrerror` C function. + A subclass of :exc:`socket.error`, this exception is raised for + address-related errors, i.e. for functions that use *h_errno* in the POSIX + C API, including :func:`gethostbyname_ex` and :func:`gethostbyaddr`. + The accompanying value is a pair ``(h_errno, string)`` representing an + error returned by a library call. *h_errno* is a numeric value, while + *string* represents the description of *h_errno*, as returned by the + :c:func:`hstrerror` C function. .. exception:: gaierror - This exception is raised for address-related errors, for :func:`getaddrinfo` and - :func:`getnameinfo`. The accompanying value is a pair ``(error, string)`` - representing an error returned by a library call. *string* represents the - description of *error*, as returned by the :c:func:`gai_strerror` C function. The - *error* value will match one of the :const:`EAI_\*` constants defined in this - module. + A subclass of :exc:`socket.error`, this exception is raised for + address-related errors by :func:`getaddrinfo` and :func:`getnameinfo`. + The accompanying value is a pair ``(error, string)`` representing an error + returned by a library call. *string* represents the description of + *error*, as returned by the :c:func:`gai_strerror` C function. The + numeric *error* value will match one of the :const:`EAI_\*` constants + defined in this module. .. exception:: timeout - This exception is raised when a timeout occurs on a socket which has had - timeouts enabled via a prior call to :meth:`~socket.settimeout`. The - accompanying value is a string whose value is currently always "timed out". + A subclass of :exc:`socket.error`, this exception is raised when a timeout + occurs on a socket which has had timeouts enabled via a prior call to + :meth:`~socket.settimeout` (or implicitly through + :func:`~socket.setdefaulttimeout`). The accompanying value is a string + whose value is currently always "timed out". .. data:: AF_UNIX

1 0

r88686 - python/branches/py3k/Doc/library/socket.rst
by antoine.pitrou 28 Feb '11

28 Feb '11

Author: antoine.pitrou Date: Mon Feb 28 23:38:07 2011 New Revision: 88686 Log: Recommend inspecting the errno attribute of socket.error objects, and improve wording. Modified: python/branches/py3k/Doc/library/socket.rst Modified: python/branches/py3k/Doc/library/socket.rst ============================================================================== --- python/branches/py3k/Doc/library/socket.rst (original) +++ python/branches/py3k/Doc/library/socket.rst Mon Feb 28 23:38:07 2011 @@ -117,39 +117,44 @@ .. index:: module: errno - This exception is raised for socket-related errors. The accompanying value is - either a string telling what went wrong or a pair ``(errno, string)`` - representing an error returned by a system call, similar to the value - accompanying :exc:`os.error`. See the module :mod:`errno`, which contains names - for the error codes defined by the underlying operating system. + A subclass of :exc:`IOError`, this exception is raised for socket-related + errors. It is recommended that you inspect its ``errno`` attribute to + discriminate between different kinds of errors. + + .. seealso:: + The :mod:`errno` module contains symbolic names for the error codes + defined by the underlying operating system. .. exception:: herror - This exception is raised for address-related errors, i.e. for functions that use - *h_errno* in the C API, including :func:`gethostbyname_ex` and - :func:`gethostbyaddr`. - - The accompanying value is a pair ``(h_errno, string)`` representing an error - returned by a library call. *string* represents the description of *h_errno*, as - returned by the :c:func:`hstrerror` C function. + A subclass of :exc:`socket.error`, this exception is raised for + address-related errors, i.e. for functions that use *h_errno* in the POSIX + C API, including :func:`gethostbyname_ex` and :func:`gethostbyaddr`. + The accompanying value is a pair ``(h_errno, string)`` representing an + error returned by a library call. *h_errno* is a numeric value, while + *string* represents the description of *h_errno*, as returned by the + :c:func:`hstrerror` C function. .. exception:: gaierror - This exception is raised for address-related errors, for :func:`getaddrinfo` and - :func:`getnameinfo`. The accompanying value is a pair ``(error, string)`` - representing an error returned by a library call. *string* represents the - description of *error*, as returned by the :c:func:`gai_strerror` C function. The - *error* value will match one of the :const:`EAI_\*` constants defined in this - module. + A subclass of :exc:`socket.error`, this exception is raised for + address-related errors by :func:`getaddrinfo` and :func:`getnameinfo`. + The accompanying value is a pair ``(error, string)`` representing an error + returned by a library call. *string* represents the description of + *error*, as returned by the :c:func:`gai_strerror` C function. The + numeric *error* value will match one of the :const:`EAI_\*` constants + defined in this module. .. exception:: timeout - This exception is raised when a timeout occurs on a socket which has had - timeouts enabled via a prior call to :meth:`~socket.settimeout`. The - accompanying value is a string whose value is currently always "timed out". + A subclass of :exc:`socket.error`, this exception is raised when a timeout + occurs on a socket which has had timeouts enabled via a prior call to + :meth:`~socket.settimeout` (or implicitly through + :func:`~socket.setdefaulttimeout`). The accompanying value is a string + whose value is currently always "timed out". .. data:: AF_UNIX

1 0

r88685 - in python/branches/py3k: Doc/library/socket.rst Lib/test/test_socket.py Misc/NEWS Modules/socketmodule.c configure configure.in pyconfig.h.in
by antoine.pitrou 28 Feb '11

28 Feb '11

Author: antoine.pitrou Date: Mon Feb 28 23:25:22 2011 New Revision: 88685 Log: Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Modified: python/branches/py3k/Doc/library/socket.rst python/branches/py3k/Lib/test/test_socket.py python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/socketmodule.c python/branches/py3k/configure python/branches/py3k/configure.in python/branches/py3k/pyconfig.h.in Modified: python/branches/py3k/Doc/library/socket.rst ============================================================================== --- python/branches/py3k/Doc/library/socket.rst (original) +++ python/branches/py3k/Doc/library/socket.rst Mon Feb 28 23:25:22 2011 @@ -521,6 +521,16 @@ meanings. +.. function:: sethostname(name) + + Set the machine's hostname to *name*. This will raise a + :exc:`socket.error` if you don't have enough rights. + + Availability: Unix. + + .. versionadded:: 3.3 + + .. data:: SocketType This is a Python type object that represents the socket object type. It is the Modified: python/branches/py3k/Lib/test/test_socket.py ============================================================================== --- python/branches/py3k/Lib/test/test_socket.py (original) +++ python/branches/py3k/Lib/test/test_socket.py Mon Feb 28 23:25:22 2011 @@ -325,6 +325,26 @@ if not fqhn in all_host_names: self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + @unittest.skipUnless(hasattr(socket, 'sethostname'), "test needs socket.sethostname()") + @unittest.skipUnless(hasattr(socket, 'gethostname'), "test needs socket.gethostname()") + def test_sethostname(self): + oldhn = socket.gethostname() + try: + socket.sethostname('new') + except socket.error as e: + if e.errno == errno.EPERM: + self.skipTest("test should be run as root") + else: + raise + try: + # running test as root! + self.assertEqual(socket.gethostname(), 'new') + # Should work with bytes objects too + socket.sethostname(b'bar') + self.assertEqual(socket.gethostname(), 'bar') + finally: + socket.sethostname(oldhn) + def testRefCountGetNameInfo(self): # Testing reference count for getnameinfo if hasattr(sys, "getrefcount"): Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Feb 28 23:25:22 2011 @@ -35,6 +35,8 @@ Library ------- +- Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. + - Issue #11140: Lock.release() now raises a RuntimeError when attempting to release an unacquired lock, as claimed in the threading documentation. The _thread.error exception is now an alias of RuntimeError. Patch by Modified: python/branches/py3k/Modules/socketmodule.c ============================================================================== --- python/branches/py3k/Modules/socketmodule.c (original) +++ python/branches/py3k/Modules/socketmodule.c Mon Feb 28 23:25:22 2011 @@ -3135,6 +3135,37 @@ \n\ Return the current host name."); +#ifdef HAVE_SETHOSTNAME +PyDoc_STRVAR(sethostname_doc, +"sethostname(name)\n\n\ +Sets the hostname to name."); + +static PyObject * +socket_sethostname(PyObject *self, PyObject *args) +{ + PyObject *hnobj; + Py_buffer buf; + int res, flag = 0; + + if (!PyArg_ParseTuple(args, "S:sethostname", &hnobj)) { + PyErr_Clear(); + if (!PyArg_ParseTuple(args, "O&:sethostname", + PyUnicode_FSConverter, &hnobj)) + return NULL; + flag = 1; + } + res = PyObject_GetBuffer(hnobj, &buf, PyBUF_SIMPLE); + if (!res) { + res = sethostname(buf.buf, buf.len); + PyBuffer_Release(&buf); + } + if (flag) + Py_DECREF(hnobj); + if (res) + return set_error(); + Py_RETURN_NONE; +} +#endif /* Python interface to gethostbyname(name). */ @@ -4233,6 +4264,10 @@ METH_VARARGS, gethostbyaddr_doc}, {"gethostname", socket_gethostname, METH_NOARGS, gethostname_doc}, +#ifdef HAVE_SETHOSTNAME + {"sethostname", socket_sethostname, + METH_VARARGS, sethostname_doc}, +#endif {"getservbyname", socket_getservbyname, METH_VARARGS, getservbyname_doc}, {"getservbyport", socket_getservbyport, Modified: python/branches/py3k/configure ============================================================================== --- python/branches/py3k/configure (original) +++ python/branches/py3k/configure Mon Feb 28 23:25:22 2011 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 88624 . +# From configure.in Revision: 88625 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 3.3. # @@ -9319,7 +9319,7 @@ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause plock poll \ pthread_init putenv readlink readlinkat realpath renameat \ select sem_open sem_timedwait sem_getvalue sem_unlink sendfile setegid seteuid \ - setgid \ + setgid sethostname \ setlocale setregid setreuid setresuid setresgid setsid setpgid setpgrp setpriority setuid setvbuf \ sigaction siginterrupt sigrelse snprintf strftime strlcpy symlinkat \ sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ Modified: python/branches/py3k/configure.in ============================================================================== --- python/branches/py3k/configure.in (original) +++ python/branches/py3k/configure.in Mon Feb 28 23:25:22 2011 @@ -2542,7 +2542,7 @@ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause plock poll \ pthread_init putenv readlink readlinkat realpath renameat \ select sem_open sem_timedwait sem_getvalue sem_unlink sendfile setegid seteuid \ - setgid \ + setgid sethostname \ setlocale setregid setreuid setresuid setresgid setsid setpgid setpgrp setpriority setuid setvbuf \ sigaction siginterrupt sigrelse snprintf strftime strlcpy symlinkat \ sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ Modified: python/branches/py3k/pyconfig.h.in ============================================================================== --- python/branches/py3k/pyconfig.h.in (original) +++ python/branches/py3k/pyconfig.h.in Mon Feb 28 23:25:22 2011 @@ -443,6 +443,9 @@ /* Define to 1 if you have the `resolv' library (-lresolv). */ #undef HAVE_LIBRESOLV +/* Define to 1 if you have the `sendfile' library (-lsendfile). */ +#undef HAVE_LIBSENDFILE + /* Define to 1 if you have the <libutil.h> header file. */ #undef HAVE_LIBUTIL_H @@ -533,12 +536,6 @@ /* Define if the OS supports pipe2() */ #undef HAVE_PIPE2 -/* Define if the OS supports pipe2() */ -#undef HAVE_PIPE2 - -/* Define if the OS supports pipe2() */ -#undef HAVE_PIPE2 - /* Define to 1 if you have the `plock' function. */ #undef HAVE_PLOCK @@ -623,6 +620,9 @@ /* Define to 1 if you have the `sem_unlink' function. */ #undef HAVE_SEM_UNLINK +/* Define to 1 if you have the `sendfile' function. */ +#undef HAVE_SENDFILE + /* Define to 1 if you have the `setegid' function. */ #undef HAVE_SETEGID @@ -635,6 +635,9 @@ /* Define if you have the 'setgroups' function. */ #undef HAVE_SETGROUPS +/* Define to 1 if you have the `sethostname' function. */ +#undef HAVE_SETHOSTNAME + /* Define to 1 if you have the `setitimer' function. */ #undef HAVE_SETITIMER @@ -849,6 +852,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the <sys/uio.h> header file. */ +#undef HAVE_SYS_UIO_H + /* Define to 1 if you have the <sys/un.h> header file. */ #undef HAVE_SYS_UN_H @@ -1084,9 +1090,6 @@ /* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* Define to 1 if you have the `sendfile' function. */ -#undef HAVE_SENDFILE - /* The size of `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T

1 0

r88684 - in python/branches/py3k/Misc: ACKS NEWS
by antoine.pitrou 28 Feb '11

28 Feb '11

Author: antoine.pitrou Date: Mon Feb 28 23:06:48 2011 New Revision: 88684 Log: Add credit for r88682. Modified: python/branches/py3k/Misc/ACKS python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Misc/ACKS ============================================================================== --- python/branches/py3k/Misc/ACKS (original) +++ python/branches/py3k/Misc/ACKS Mon Feb 28 23:06:48 2011 @@ -326,6 +326,7 @@ Fabian Groffen Eric Groo Dag Gruneau +Filip Gruszczyński Michael Guravage Lars Gustäbel Thomas Güttler Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Feb 28 23:06:48 2011 @@ -37,7 +37,8 @@ - Issue #11140: Lock.release() now raises a RuntimeError when attempting to release an unacquired lock, as claimed in the threading documentation. - The _thread.error exception is now an alias of RuntimeError. + The _thread.error exception is now an alias of RuntimeError. Patch by + Filip Gruszczyński. - Issue 8594: ftplib now provides a source_address parameter to specify which (address, port) to bind to before connecting.

1 0

r88683 - python/branches/py3k/Doc/library/threading.rst
by antoine.pitrou 28 Feb '11

28 Feb '11

Author: antoine.pitrou Date: Mon Feb 28 23:04:51 2011 New Revision: 88683 Log: No need to put this at top Modified: python/branches/py3k/Doc/library/threading.rst Modified: python/branches/py3k/Doc/library/threading.rst ============================================================================== --- python/branches/py3k/Doc/library/threading.rst (original) +++ python/branches/py3k/Doc/library/threading.rst Mon Feb 28 23:04:51 2011 @@ -20,17 +20,6 @@ methods and functions in this module in the Python 2.x series are still supported by this module. -.. impl-detail:: - - Due to the :term:`Global Interpreter Lock`, in CPython only one thread - can execute Python code at once (even though certain performance-oriented - libraries might overcome this limitation). - If you want your application to make better of use of the computational - resources of multi-core machines, you are advised to use - :mod:`multiprocessing` or :class:`concurrent.futures.ProcessPoolExecutor`. - However, threading is still an appropriate model if you want to run - multiple I/O-bound tasks simultaneously. - This module defines the following functions and objects: @@ -374,6 +363,18 @@ property instead. +.. impl-detail:: + + Due to the :term:`Global Interpreter Lock`, in CPython only one thread + can execute Python code at once (even though certain performance-oriented + libraries might overcome this limitation). + If you want your application to make better of use of the computational + resources of multi-core machines, you are advised to use + :mod:`multiprocessing` or :class:`concurrent.futures.ProcessPoolExecutor`. + However, threading is still an appropriate model if you want to run + multiple I/O-bound tasks simultaneously. + + .. _lock-objects: Lock Objects

1 0

devinabox: Update build and test running scripts so they are executable.
by brett.cannon 28 Feb '11

28 Feb '11

brett.cannon pushed a1e5643bdd1d to devinabox: http://hg.python.org/devinabox/rev/a1e5643bdd1d changeset: 10:a1e5643bdd1d user: Brett Cannon <brett(a)python.org> date: Fri Feb 25 17:45:38 2011 -0800 summary: Update build and test running scripts so they are executable. files: build_cpython.py run_tests.py diff --git a/build_cpython.py b/build_cpython.py old mode 100644 new mode 100755 diff --git a/run_tests.py b/run_tests.py old mode 100644 new mode 100755 -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Get the argument parser written (but not wired up).
by brett.cannon 28 Feb '11

28 Feb '11

brett.cannon pushed 36aab8aa3dea to devinabox: http://hg.python.org/devinabox/rev/36aab8aa3dea changeset: 11:36aab8aa3dea user: Brett Cannon <brett(a)python.org> date: Fri Feb 25 18:13:18 2011 -0800 summary: Get the argument parser written (but not wired up). files: box.py diff --git a/box.py b/box.py --- a/box.py +++ b/box.py @@ -5,12 +5,9 @@ to download) everything you need to contribute to (C)Python's development (sans a compiler): - * Mercurial: source download + * Mercurial: source download & TortoiseHG for 32/64-bit Windows Hg is Python's VCS (Version Control System). - * TortoiseHg: Windows 32/64 - For ease-of-use for Windows users. - * Visual C++ Express: English Web installer So Windows users can compile CPython. OS X users should install XCode (http://developer.apple.com/) and @@ -19,22 +16,22 @@ Linux user should install gcc or clang using their distribution's package managers. - * Python Developer's Guide - "The devguide"; documentation on how to contribute to Python. + * coverage.py: cloned repository + For measuring the coverage of Python's test suite. Includes a + cloned repository instead of the latest release as cutting-edge support + is occasionally needed to support the in-development version of Python. * Python Enhancement Proposals Also known as PEPs. This is included as reference material, especially for PEPs 7 & 8 (the C and Python style guides, respectively). + * Python Developer's Guide + "The devguide"; documentation on how to contribute to Python. + * CPython The included repository clone has branches for all versions of Python either under development or maintenance. - * coverage.py: cloned repository - For measuring the coverage of Python's test suite. Includes a - cloned repository instead of the latest release as cutting-edge support - is occasionally needed to support the in-development version of Python. - Once the requisite code has been checked out, various optional steps can be performed to make the lives of users easier: @@ -288,26 +285,29 @@ def build(self): cmd = 'make' if sys.platform != 'win32' else 'make.bat' - with change_cwd(os.path.join(self.directory, 'Doc'): + with change_cwd(os.path.join(self.directory, 'Doc')): subprocess.check_call([cmd, 'html']) if __name__ == '__main__': import argparse - parser = arparse.ArgumentParser(prog='Python-Dev In a Box') + + all_providers = (CPython, Devguide, PEPs, CoveragePy, Mercurial, + Visual_Studio_Express) + parser = argparse.ArgumentParser(prog='Python-Dev In a Box') subparsers = parser.add_subparsers() # XXX help - parser_create = subparsers.add_parser('create') # XXX help - # XXX --all option - # XXX --basic option (everything that doesn't require a Web browser) - # XXX --miniumum option (cpython, devguide, peps) + parser_create = subparsers.add_parser('create', + help='Create a %(prog)s') + parser_create.add_argument('--build', action='store_true', default=False) + group = parser_create.add_mutually_exclusive_group() + group.add_argument('--all', dest='providers', action='store_const', + const=all_providers, + help='Provide everything (the default)') + group.add_argument('--basic', dest='providers', action='store_const', + const=(CPython, Devguide, PEPs, CoveragePy), + help='Provide the basics people probably are lacking') + group.add_argument('--minimum', dest='providers', action='store_const', + const=(CPython, Devguide, PEPs), + help='Provide the bare minimum to be productive') # XXX --build option - parser_update = subparsers.add_parser('update') # XXX help - # XXX also run build - - - - for provider in (CPython, Devguide, PEPs, Mercurial, CoveragePy, - Visual_Studio_Express,): - print('Creating', provider.__name__.replace('_', ' ')) - provider().create() - print() + # XXX parser_update = subparsers.add_parser('update', help='Update the %(prog)s') # XXX also run build -- Repository URL: http://hg.python.org/devinabox

1 0