Mailman 3 July 2012 - Python-checkins

cpython: Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
by ned.deily 30 Jul '12

30 Jul '12

http://hg.python.org/cpython/rev/f96579debefa changeset: 78325:f96579debefa user: Ned Deily <nad(a)acm.org> date: Mon Jul 30 02:35:58 2012 -0700 summary: Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. Also add tests in the OS X installer build to ensure that the desired dynamic linking with an optional newer Tcl/Tk in /Library actually happens. files: Mac/BuildScript/build-installer.py | 57 ++++++++++++++--- Misc/NEWS | 2 + setup.py | 4 +- 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -161,6 +161,13 @@ --universal-archs=x universal architectures (options: %(UNIVERSALOPTS)r, default: %(UNIVERSALARCHS)r) """)% globals() +# Dict of object file names with shared library names to check after building. +# This is to ensure that we ended up dynamically linking with the shared +# library paths and versions we expected. For example: +# EXPECTED_SHARED_LIBS['_tkinter.so'] = [ +# '/Library/Frameworks/Tcl.framework/Versions/8.5/Tcl', +# '/Library/Frameworks/Tk.framework/Versions/8.5/Tk'] +EXPECTED_SHARED_LIBS = {} # Instructions for building libraries that are necessary for building a # batteries included python. @@ -460,27 +467,40 @@ # Because we only support dynamic load of only one major/minor version of # Tcl/Tk, ensure: # 1. there are no user-installed frameworks of Tcl/Tk with version - # higher than the Apple-supplied system version - # 2. there is a user-installed framework in /Library/Frameworks with the - # same version as the system version. This allows users to choose - # to install a newer patch level. + # higher than the Apple-supplied system version in + # SDKROOT/System/Library/Frameworks + # 2. there is a user-installed framework (usually ActiveTcl) in (or linked + # in) SDKROOT/Library/Frameworks with the same version as the system + # version. This allows users to choose to install a newer patch level. + frameworks = {} for framework in ['Tcl', 'Tk']: - #fw = dict(lower=framework.lower(), - # upper=framework.upper(), - # cap=framework.capitalize()) - #fwpth = "Library/Frameworks/%(cap)s.framework/%(lower)sConfig.sh" % fw - fwpth = 'Library/Frameworks/Tcl.framework/Versions/Current' + fwpth = 'Library/Frameworks/%s.framework/Versions/Current' % framework sysfw = os.path.join(SDKPATH, 'System', fwpth) - libfw = os.path.join('/', fwpth) + libfw = os.path.join(SDKPATH, fwpth) usrfw = os.path.join(os.getenv('HOME'), fwpth) - #version = "%(upper)s_VERSION" % fw + frameworks[framework] = os.readlink(sysfw) + if not os.path.exists(libfw): + fatal("Please install a link to a current %s %s as %s so " + "the user can override the system framework." + % (framework, frameworks[framework], libfw)) if os.readlink(libfw) != os.readlink(sysfw): fatal("Version of %s must match %s" % (libfw, sysfw) ) if os.path.exists(usrfw): fatal("Please rename %s to avoid possible dynamic load issues." % usrfw) + if frameworks['Tcl'] != frameworks['Tk']: + fatal("The Tcl and Tk frameworks are not the same version.") + + # add files to check after build + EXPECTED_SHARED_LIBS['_tkinter.so'] = [ + "/Library/Frameworks/Tcl.framework/Versions/%s/Tcl" + % frameworks['Tcl'], + "/Library/Frameworks/Tk.framework/Versions/%s/Tk" + % frameworks['Tk'], + ] + # Remove inherited environment variables which might influence build environ_var_prefixes = ['CPATH', 'C_INCLUDE_', 'DYLD_', 'LANG', 'LC_', 'LD_', 'LIBRARY_', 'PATH', 'PYTHON'] @@ -861,12 +881,12 @@ frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework') gid = grp.getgrnam('admin').gr_gid + shared_lib_error = False for dirpath, dirnames, filenames in os.walk(frmDir): for dn in dirnames: os.chmod(os.path.join(dirpath, dn), STAT_0o775) os.chown(os.path.join(dirpath, dn), -1, gid) - for fn in filenames: if os.path.islink(fn): continue @@ -877,6 +897,19 @@ os.chmod(p, stat.S_IMODE(st.st_mode) | stat.S_IWGRP) os.chown(p, -1, gid) + if fn in EXPECTED_SHARED_LIBS: + # check to see that this file was linked with the + # expected library path and version + data = captureCommand("otool -L %s" % shellQuote(p)) + for sl in EXPECTED_SHARED_LIBS[fn]: + if ("\t%s " % sl) not in data: + print("Expected shared lib %s was not linked with %s" + % (sl, p)) + shared_lib_error = True + + if shared_lib_error: + fatal("Unexpected shared library errors.") + if PYTHON_3: LDVERSION=None VERSION=None diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -264,6 +264,8 @@ Build ----- +- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs. + - Issue #15431: Add _freeze_importlib project to regenerate importlib.h on Windows. Patch by Kristján Valur Jónsson. diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -69,7 +69,9 @@ """ Returns True if 'path' can be located in an OSX SDK """ - return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/') + return ( (path.startswith('/usr/') and not path.startswith('/usr/local')) + or path.startswith('/System/') + or path.startswith('/Library/') ) def find_file(filename, std_dirs, paths): """Searches for the directory where a given file is located, -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix invalid UTF-8 encoding in commit message.
by ned.deily 30 Jul '12

30 Jul '12

http://hg.python.org/cpython/rev/457195ddf172 changeset: 78324:457195ddf172 parent: 78322:917295aaad76 user: Ned Deily <nad(a)acm.org> date: Mon Jul 30 02:34:03 2012 -0700 summary: Fix invalid UTF-8 encoding in commit message. files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -265,7 +265,7 @@ ----- - Issue #15431: Add _freeze_importlib project to regenerate importlib.h - on Windows. Patch by Kristj�n Valur J�nsson. + on Windows. Patch by Kristján Valur Jónsson. - Issue #14197: For OS X framework builds, ensure links to the shared library are created with the proper ABI suffix. -- Repository URL: http://hg.python.org/cpython

1 0

peps: Update PEP-0424 with respect to feedback received.
by alex.gaynor 30 Jul '12

30 Jul '12

http://hg.python.org/peps/rev/055f717ee69a changeset: 4492:055f717ee69a parent: 4490:d4e77ba5329d user: Alex Gaynor <alex.gaynor(a)gmail.com> date: Mon Jul 16 20:00:55 2012 -0700 summary: Update PEP-0424 with respect to feedback received. files: pep-0424.txt | 43 ++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/pep-0424.txt b/pep-0424.txt --- a/pep-0424.txt +++ b/pep-0424.txt @@ -15,7 +15,7 @@ CPython currently defines an ``__length_hint__`` method on several types, such as various iterators. This method is then used by various other functions (such -as ``map``) to presize lists based on the estimated returned by +as ``list``) to presize lists based on the estimated returned by ``__length_hint__``. Types can then define ``__length_hint__`` which are not sized, and thus should not define ``__len__``, but can estimate or compute a size (such as many iterators). @@ -26,11 +26,42 @@ This PEP proposes formally documenting ``__length_hint__`` for other interpreter and non-standard library Python to implement. -``__length_hint__`` must return an integer (else a TypeError is raised), and is -not required to be accurate. It may return a value that is either larger or -smaller than the actual size ofthe container. It may raise a ``TypeError`` if a -specific instance cannot have its length estimated. It may not return a -negative value (else a ValueError is raised). +``__length_hint__`` must return an integer (else a TypeError is raised) or +``NotImplemented, and is not required to be accurate. It may return a value +that is either larger or smaller than the actual size ofthe container. A return value of ``NotImplemented`` indicates that there is no finite length estimate. +It may not return a negative value (else a ValueError is raised). + +In addition, a new function ``operator.length`` hint is added, having the +follow semantics (which define how ``__length_hint__`` should be used:: + + def length_hint(obj, default): + """ + Return an estimate of the number of items in obj. This is + useful for presizing containers when building from an iterable. + + If the object supports len(), the result will be exact. Otherwise, it + may over or underestimate by an arbitrary amount. The result will be an + integer >= 0. + """ + try: + return len(obj) + except TypeError: + try: + get_hint = obj.__length_hint__ + except AttributeError: + return default + hint = get_hint() + if hint is NotImplemented: + return default + if not isinstance(hint, int): + raise TypeError("Length hint must be an integer, not %r" % type(hint)) + if hint < 0: + raise ValueError("Length hint (%r) must be >= 0" % hint) + return hint + +Callers are required to provide a default value, because there is no sane +return value for objects which do not provide a length or length hint. + Rationale ========= -- Repository URL: http://hg.python.org/peps

2 1

Daily reference leaks (917295aaad76): sum=0
by solipsis＠pitrou.net 30 Jul '12

30 Jul '12

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

1 0

peps: Whitespace and spelling fixes.
by alex.gaynor 30 Jul '12

30 Jul '12

http://hg.python.org/peps/rev/7fd8d7c91bb0 changeset: 4494:7fd8d7c91bb0 user: Alex Gaynor <alex.gaynor(a)gmail.com> date: Sun Jul 29 18:10:33 2012 -0700 summary: Whitespace and spelling fixes. files: pep-0424.txt | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pep-0424.txt b/pep-0424.txt --- a/pep-0424.txt +++ b/pep-0424.txt @@ -28,8 +28,9 @@ ``__length_hint__`` must return an integer (else a TypeError is raised) or ``NotImplemented, and is not required to be accurate. It may return a value -that is either larger or smaller than the actual size ofthe container. A return value of ``NotImplemented`` indicates that there is no finite length estimate. -It may not return a negative value (else a ValueError is raised). +that is either larger or smaller than the actual size of the container. A +return value of ``NotImplemented`` indicates that there is no finite length +estimate. It may not return a negative value (else a ValueError is raised). In addition, a new function ``operator.length`` hint is added, having the follow semantics (which define how ``__length_hint__`` should be used:: @@ -66,7 +67,8 @@ Rationale ========= -Being able to pre-allocate lists based on the expected size, as estimated by ``__length_hint__``, can be a significant optimization. CPython has been +Being able to pre-allocate lists based on the expected size, as estimated by +``__length_hint__``, can be a significant optimization. CPython has been observed to run some code faster than PyPy, purely because of this optimization being present. -- Repository URL: http://hg.python.org/peps

1 0

peps (merge default -> default): Merged upstream.
by alex.gaynor 30 Jul '12

30 Jul '12

http://hg.python.org/peps/rev/bd9ac2ef37a1 changeset: 4493:bd9ac2ef37a1 parent: 4492:055f717ee69a parent: 4491:7838a83c3ad1 user: Alex Gaynor <alex.gaynor(a)gmail.com> date: Sun Jul 29 18:08:14 2012 -0700 summary: Merged upstream. files: pep-0398.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pep-0398.txt b/pep-0398.txt --- a/pep-0398.txt +++ b/pep-0398.txt @@ -17,7 +17,7 @@ Python 3.3. The schedule primarily concerns itself with PEP-sized items. Small features may be added up to and including the first beta release. Bugs may be fixed until the final release, which is planned -for August 2012. +for September 2012. Release Manager and Crew @@ -42,10 +42,10 @@ (No new features beyond this point.) -- 3.3.0 beta 2: July 14, 2012 -- 3.3.0 candidate 1: July 28, 2012 -- 3.3.0 candidate 2: August 11, 2012 -- 3.3.0 final: August 25, 2012 +- 3.3.0 beta 2: July 21, 2012 +- 3.3.0 candidate 1: August 4, 2012 +- 3.3.0 candidate 2: August 18, 2012 +- 3.3.0 final: September 1, 2012 .. don't forget to update final date above as well -- Repository URL: http://hg.python.org/peps

1 0

devguide: Closes #15493: fix link to daily DMG installer
by antoine.pitrou 29 Jul '12

29 Jul '12

http://hg.python.org/devguide/rev/89d9874dfd13 changeset: 535:89d9874dfd13 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Jul 30 01:00:52 2012 +0200 summary: Closes #15493: fix link to daily DMG installer files: index.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/index.rst b/index.rst --- a/index.rst +++ b/index.rst @@ -165,7 +165,7 @@ * Source code * `Browse online <http://hg.python.org/cpython/file/default/>`_ * `Snapshot of py3k <http://hg.python.org/cpython/archive/default.tar.bz2>`_ - * `Daily OS X installer <http://www.python.org/dev/daily-dmg/>`_ + * `Daily OS X installer <http://buildbot.python.org/daily-dmg/>`_ * Tool support * :doc:`emacs` * :doc:`gdb` -- Repository URL: http://hg.python.org/devguide

1 0

devguide: #15491: change a couple more links to point to the "default" branch.
by ezio.melotti 29 Jul '12

29 Jul '12

http://hg.python.org/devguide/rev/54ec1b493006 changeset: 534:54ec1b493006 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Mon Jul 30 00:23:03 2012 +0200 summary: #15491: change a couple more links to point to the "default" branch. files: index.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.rst b/index.rst --- a/index.rst +++ b/index.rst @@ -164,7 +164,7 @@ * `Buildbot status`_ * Source code * `Browse online <http://hg.python.org/cpython/file/default/>`_ - * `Snapshot of py3k <http://hg.python.org/cpython/archive/tip.tar.bz2>`_ + * `Snapshot of py3k <http://hg.python.org/cpython/archive/default.tar.bz2>`_ * `Daily OS X installer <http://www.python.org/dev/daily-dmg/>`_ * Tool support * :doc:`emacs` @@ -182,7 +182,7 @@ .. _Buildbot status: http://python.org/dev/buildbot/ .. _Firefox search engine plug-in: http://www.python.org/dev/searchplugin/ -.. _Misc directory: http://hg.python.org/cpython/file/tip/Misc +.. _Misc directory: http://hg.python.org/cpython/file/default/Misc .. _PEPs: http://www.python.org/dev/peps .. _python.org maintenance: http://python.org/dev/pydotorg/ .. _Python Mentors: http://pythonmentors.com/ -- Repository URL: http://hg.python.org/devguide

1 0

devguide: #15491: link to the file list of the "default" branch.
by ezio.melotti 29 Jul '12

29 Jul '12

http://hg.python.org/devguide/rev/0529e2062ec7 changeset: 533:0529e2062ec7 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Mon Jul 30 00:10:06 2012 +0200 summary: #15491: link to the file list of the "default" branch. files: index.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/index.rst b/index.rst --- a/index.rst +++ b/index.rst @@ -163,7 +163,7 @@ * `Firefox search engine plug-in`_ * `Buildbot status`_ * Source code - * `Browse online <http://hg.python.org/cpython/>`_ + * `Browse online <http://hg.python.org/cpython/file/default/>`_ * `Snapshot of py3k <http://hg.python.org/cpython/archive/tip.tar.bz2>`_ * `Daily OS X installer <http://www.python.org/dev/daily-dmg/>`_ * Tool support -- Repository URL: http://hg.python.org/devguide

1 0

cpython (2.7): Issue #15489: Add a __sizeof__ implementation for BytesIO objects.
by antoine.pitrou 29 Jul '12

29 Jul '12

http://hg.python.org/cpython/rev/e8851809ae83 changeset: 78323:e8851809ae83 branch: 2.7 parent: 78320:1102e86b8739 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Jul 30 00:01:06 2012 +0200 summary: Issue #15489: Add a __sizeof__ implementation for BytesIO objects. Patch by Serhiy Storchaka. files: Lib/test/test_memoryio.py | 11 +++++++++++ Misc/NEWS | 3 +++ Modules/_io/bytesio.c | 12 ++++++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -638,6 +638,17 @@ memio.close() self.assertRaises(ValueError, memio.__setstate__, (b"closed", 0, None)) + check_sizeof = support.check_sizeof + + @support.cpython_only + def test_sizeof(self): + basesize = support.calcobjsize(b'P2PP2P') + check = self.check_sizeof + self.assertEqual(object.__sizeof__(io.BytesIO()), basesize) + check(io.BytesIO(), basesize ) + check(io.BytesIO(b'a'), basesize + 1 + 1 ) + check(io.BytesIO(b'a' * 1000), basesize + 1000 + 1 ) + class CStringIOTest(PyStringIOTest): ioclass = io.StringIO diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -92,6 +92,9 @@ Library ------- +- Issue #15489: Add a __sizeof__ implementation for BytesIO objects. + Patch by Serhiy Storchaka. + - Issue #15487: Add a __sizeof__ implementation for buffered I/O objects. Patch by Serhiy Storchaka. diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -794,6 +794,17 @@ return 0; } +static PyObject * +bytesio_sizeof(bytesio *self, void *unused) +{ + Py_ssize_t res; + + res = sizeof(bytesio); + if (self->buf) + res += self->buf_size; + return PyLong_FromSsize_t(res); +} + static int bytesio_traverse(bytesio *self, visitproc visit, void *arg) { @@ -835,6 +846,7 @@ {"truncate", (PyCFunction)bytesio_truncate, METH_VARARGS, truncate_doc}, {"__getstate__", (PyCFunction)bytesio_getstate, METH_NOARGS, NULL}, {"__setstate__", (PyCFunction)bytesio_setstate, METH_O, NULL}, + {"__sizeof__", (PyCFunction)bytesio_sizeof, METH_NOARGS, NULL}, {NULL, NULL} /* sentinel */ }; -- Repository URL: http://hg.python.org/cpython

1 0