Mailman 3 December 2012 - Python-checkins

cpython (2.7): - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
by christian.heimes Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/cpython/rev/0fa67e3f195d changeset: 80675:0fa67e3f195d branch: 2.7 parent: 80670:c82151aac59a user: Christian Heimes <christian(a)cheimes.de> date: Sun Dec 02 08:14:50 2012 +0100 summary: - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf files: Makefile.pre.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -410,11 +410,12 @@ # Build the shared modules -# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for +# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for # -s, --silent or --quiet is always the first char. +# Under BSD make, MAKEFLAGS might be " -s -v x=y". sharedmods: $(BUILDPYTHON) @case "$$MAKEFLAGS" in \ - s*) quiet="-q";; \ + *\ -s*|s*) quiet="-q";; \ *) quiet="";; \ esac; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.3): Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
by christian.heimes Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/cpython/rev/323f0aeba89d changeset: 80674:323f0aeba89d branch: 3.3 parent: 80658:cff7995ca7e8 parent: 80673:ceb325fdd54e user: Christian Heimes <christian(a)cheimes.de> date: Sun Dec 02 08:23:05 2012 +0100 summary: Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf files: Makefile.pre.in | 5 +++-- Misc/NEWS | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -478,11 +478,12 @@ $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars # Build the shared modules -# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for +# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for # -s, --silent or --quiet is always the first char. +# Under BSD make, MAKEFLAGS might be " -s -v x=y". sharedmods: $(BUILDPYTHON) pybuilddir.txt @case "$$MAKEFLAGS" in \ - s*) quiet="-q";; \ + *\ -s*|s*) quiet="-q";; \ *) quiet="";; \ esac; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -277,6 +277,8 @@ Build ----- +- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf + - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. - Issue #15298: ensure _sysconfigdata is generated in build directory, not -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
by christian.heimes Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/cpython/rev/ceb325fdd54e changeset: 80673:ceb325fdd54e branch: 3.2 parent: 80657:a35ee2d6a4ad user: Christian Heimes <christian(a)cheimes.de> date: Sun Dec 02 08:14:50 2012 +0100 summary: - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf files: Makefile.pre.in | 5 +++-- Misc/NEWS | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -441,11 +441,12 @@ # Build the shared modules -# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for +# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for # -s, --silent or --quiet is always the first char. +# Under BSD make, MAKEFLAGS might be " -s -v x=y". sharedmods: $(BUILDPYTHON) @case "$$MAKEFLAGS" in \ - s*) quiet="-q";; \ + *\ -s*|s*) quiet="-q";; \ *) quiet="";; \ esac; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -706,6 +706,8 @@ Build ----- +- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf + - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. - Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
by christian.heimes Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/cpython/rev/50af56c27b9a changeset: 80671:50af56c27b9a parent: 80669:2c04d2102534 user: Christian Heimes <christian(a)cheimes.de> date: Sun Dec 02 07:37:35 2012 +0100 summary: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf files: Makefile.pre.in | 5 +++-- Misc/ACKS | 1 + Misc/NEWS | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -478,11 +478,12 @@ $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars # Build the shared modules -# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for +# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for # -s, --silent or --quiet is always the first char. +# Under BSD make, MAKEFLAGS might be " -s -v x=y". sharedmods: $(BUILDPYTHON) pybuilddir.txt @case "$$MAKEFLAGS" in \ - s*) quiet="-q";; \ + *\ -s*|s*) quiet="-q";; \ *) quiet="";; \ esac; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1075,6 +1075,7 @@ Pete Sevander Denis Severson Ian Seyer +Daniel Shahaf Ha Shao Mark Shannon Richard Shapiro diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -408,6 +408,8 @@ Build ----- +- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf + - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed. - Issue #15298: ensure _sysconfigdata is generated in build directory, not -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Minor fixups. Early-out for equality test. Inline PREV/NEXT constants.
by raymond.hettinger Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/cpython/rev/c82151aac59a changeset: 80670:c82151aac59a branch: 2.7 parent: 80668:62fed5f18681 user: Raymond Hettinger <python(a)rcn.com> date: Sat Dec 01 19:22:02 2012 -0800 summary: Minor fixups. Early-out for equality test. Inline PREV/NEXT constants. files: Lib/collections.py | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Lib/collections.py b/Lib/collections.py --- a/Lib/collections.py +++ b/Lib/collections.py @@ -6,11 +6,12 @@ __all__ += _abcoll.__all__ from _collections import deque, defaultdict -from operator import itemgetter as _itemgetter +from operator import itemgetter as _itemgetter, eq as _eq from keyword import iskeyword as _iskeyword import sys as _sys import heapq as _heapq from itertools import repeat as _repeat, chain as _chain, starmap as _starmap +from itertools import imap as _imap try: from thread import get_ident as _get_ident @@ -50,44 +51,42 @@ self.__map = {} self.__update(*args, **kwds) - def __setitem__(self, key, value, PREV=0, NEXT=1, dict_setitem=dict.__setitem__): + def __setitem__(self, key, value, dict_setitem=dict.__setitem__): 'od.__setitem__(i, y) <==> od[i]=y' # Setting a new item creates a new link at the end of the linked list, # and the inherited dictionary is updated with the new key/value pair. if key not in self: root = self.__root - last = root[PREV] - last[NEXT] = root[PREV] = self.__map[key] = [last, root, key] + last = root[0] + last[1] = root[0] = self.__map[key] = [last, root, key] return dict_setitem(self, key, value) - def __delitem__(self, key, PREV=0, NEXT=1, dict_delitem=dict.__delitem__): + def __delitem__(self, key, dict_delitem=dict.__delitem__): 'od.__delitem__(y) <==> del od[y]' # Deleting an existing item uses self.__map to find the link which gets # removed by updating the links in the predecessor and successor nodes. dict_delitem(self, key) link_prev, link_next, key = self.__map.pop(key) - link_prev[NEXT] = link_next - link_next[PREV] = link_prev + link_prev[1] = link_next # update link_prev[NEXT] + link_next[0] = link_prev # update link_next[PREV] def __iter__(self): 'od.__iter__() <==> iter(od)' # Traverse the linked list in order. - NEXT, KEY = 1, 2 root = self.__root - curr = root[NEXT] + curr = root[1] # start at the first node while curr is not root: - yield curr[KEY] - curr = curr[NEXT] + yield curr[2] # yield the curr[KEY] + curr = curr[1] # move to next node def __reversed__(self): 'od.__reversed__() <==> reversed(od)' # Traverse the linked list in reverse order. - PREV, KEY = 0, 2 root = self.__root - curr = root[PREV] + curr = root[0] # start at the last node while curr is not root: - yield curr[KEY] - curr = curr[PREV] + yield curr[2] # yield the curr[KEY] + curr = curr[0] # move to previous node def clear(self): 'od.clear() -> None. Remove all items from od.' @@ -206,7 +205,7 @@ ''' if isinstance(other, OrderedDict): - return len(self)==len(other) and self.items() == other.items() + return dict.__eq__(self, other) and all(_imap(_eq, self, other)) return dict.__eq__(self, other) def __ne__(self, other): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #16590: remove obsolete compatibility code from the _json module.
by antoine.pitrou Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/cpython/rev/2c04d2102534 changeset: 80669:2c04d2102534 parent: 80667:6fdc5e3daa8c user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 01 19:34:16 2012 +0100 summary: Issue #16590: remove obsolete compatibility code from the _json module. Patch by Serhiy Storchaka. files: Modules/_json.c | 45 ++++-------------------------------- 1 files changed, 5 insertions(+), 40 deletions(-) diff --git a/Modules/_json.c b/Modules/_json.c --- a/Modules/_json.c +++ b/Modules/_json.c @@ -2,20 +2,6 @@ #include "structmember.h" #include "accu.h" -#if PY_VERSION_HEX < 0x02060000 && !defined(Py_TYPE) -#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) -#endif -#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN) -typedef int Py_ssize_t; -#define PY_SSIZE_T_MAX INT_MAX -#define PY_SSIZE_T_MIN INT_MIN -#define PyInt_FromSsize_t PyInt_FromLong -#define PyInt_AsSsize_t PyInt_AsLong -#endif -#ifndef Py_IS_FINITE -#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) -#endif - #ifdef __GNUC__ #define UNUSED __attribute__((__unused__)) #else @@ -129,33 +115,12 @@ raise_errmsg(char *msg, PyObject *s, Py_ssize_t end); static PyObject * encoder_encode_string(PyEncoderObject *s, PyObject *obj); -static int -_convertPyInt_AsSsize_t(PyObject *o, Py_ssize_t *size_ptr); -static PyObject * -_convertPyInt_FromSsize_t(Py_ssize_t *size_ptr); static PyObject * encoder_encode_float(PyEncoderObject *s, PyObject *obj); #define S_CHAR(c) (c >= ' ' && c <= '~' && c != '\\' && c != '"') #define IS_WHITESPACE(c) (((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r')) -static int -_convertPyInt_AsSsize_t(PyObject *o, Py_ssize_t *size_ptr) -{ - /* PyObject to Py_ssize_t converter */ - *size_ptr = PyLong_AsSsize_t(o); - if (*size_ptr == -1 && PyErr_Occurred()) - return 0; - return 1; -} - -static PyObject * -_convertPyInt_FromSsize_t(Py_ssize_t *size_ptr) -{ - /* Py_ssize_t to PyObject converter */ - return PyLong_FromSsize_t(*size_ptr); -} - static Py_ssize_t ascii_escape_unichar(Py_UCS4 c, unsigned char *output, Py_ssize_t chars) { @@ -265,7 +230,7 @@ if (errmsg_fn == NULL) return; } - pymsg = PyObject_CallFunction(errmsg_fn, "(zOO&)", msg, s, _convertPyInt_FromSsize_t, &end); + pymsg = PyObject_CallFunction(errmsg_fn, "(zOn)", msg, s, end); if (pymsg) { PyErr_SetObject(PyExc_ValueError, pymsg); Py_DECREF(pymsg); @@ -524,7 +489,7 @@ Py_ssize_t end; Py_ssize_t next_end = -1; int strict = 1; - if (!PyArg_ParseTuple(args, "OO&|i:scanstring", &pystr, _convertPyInt_AsSsize_t, &end, &strict)) { + if (!PyArg_ParseTuple(args, "On|i:scanstring", &pystr, &end, &strict)) { return NULL; } if (PyUnicode_Check(pystr)) { @@ -1087,7 +1052,7 @@ PyScannerObject *s; assert(PyScanner_Check(self)); s = (PyScannerObject *)self; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&:scan_once", kwlist, &pystr, _convertPyInt_AsSsize_t, &idx)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "On:scan_once", kwlist, &pystr, &idx)) return NULL; if (PyUnicode_Check(pystr)) { @@ -1288,8 +1253,8 @@ assert(PyEncoder_Check(self)); s = (PyEncoderObject *)self; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&:_iterencode", kwlist, - &obj, _convertPyInt_AsSsize_t, &indent_level)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "On:_iterencode", kwlist, + &obj, &indent_level)) return NULL; if (_PyAccu_Init(&acc)) return NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #16589: fix pprint signatures in the doc (backport of 106ee4eb5970).
by ezio.melotti Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/cpython/rev/62fed5f18681 changeset: 80668:62fed5f18681 branch: 2.7 parent: 80666:1e614dae8448 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Dec 01 19:36:00 2012 +0200 summary: #16589: fix pprint signatures in the doc (backport of 106ee4eb5970). files: Doc/library/pprint.rst | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -36,7 +36,7 @@ .. First the implementation class: -.. class:: PrettyPrinter(...) +.. class:: PrettyPrinter(indent=1, width=80, depth=None, stream=None) Construct a :class:`PrettyPrinter` instance. This constructor understands several keyword parameters. An output stream may be set using the *stream* @@ -73,9 +73,7 @@ The :class:`PrettyPrinter` class supports several derivative functions: -.. Now the derivative functions: - -.. function:: pformat(object[, indent[, width[, depth]]]) +.. function:: pformat(object, indent=1, width=80, depth=None) Return the formatted representation of *object* as a string. *indent*, *width* and *depth* will be passed to the :class:`PrettyPrinter` constructor as @@ -85,10 +83,10 @@ The parameters *indent*, *width* and *depth* were added. -.. function:: pprint(object[, stream[, indent[, width[, depth]]]]) +.. function:: pprint(object, stream=None, indent=1, width=80, depth=None) Prints the formatted representation of *object* on *stream*, followed by a - newline. If *stream* is omitted, ``sys.stdout`` is used. This may be used in + newline. If *stream* is ``None``, ``sys.stdout`` is used. This may be used in the interactive interpreter instead of a :keyword:`print` statement for inspecting values. *indent*, *width* and *depth* will be passed to the :class:`PrettyPrinter` constructor as formatting parameters. @@ -206,7 +204,8 @@ pprint Example -------------- -This example demonstrates several uses of the :func:`pprint` function and its parameters. +This example demonstrates several uses of the :func:`pprint` function and its +parameters. >>> import pprint >>> tup = ('spam', ('eggs', ('lumberjack', ('knights', ('ni', ('dead', -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Clarify a sentence and fix a typo. Patch by Daniel Shahaf.
by ezio.melotti Dec. 1, 2012

Dec. 1, 2012

http://hg.python.org/devguide/rev/06225ce4c1d3 changeset: 577:06225ce4c1d3 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sat Dec 01 16:07:51 2012 +0200 summary: Clarify a sentence and fix a typo. Patch by Daniel Shahaf. files: buildbots.rst | 2 +- tracker.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildbots.rst b/buildbots.rst --- a/buildbots.rst +++ b/buildbots.rst @@ -54,7 +54,7 @@ --------- A subset of the buildbots are marked "stable". They are taken into account -when making a new release. The rule is that no stable buildbot must witness +when making a new release. The rule is that all builders must be free of persistent failures when the release is cut. It is absolutely **vital** that core developers fix any issue they introduce on the stable buildbots, as soon as possible. diff --git a/tracker.rst b/tracker.rst --- a/tracker.rst +++ b/tracker.rst @@ -50,7 +50,7 @@ * if you have JavaScript enabled, you can use the **Nosy List** field to search developers that can help with the issue by entering the name of the affected module, operating system, or interest area. -* least but not last, you have to describe the problem in detail, including +* last but not least, you have to describe the problem in detail, including what you expected to happen and what did happen, in the **Comment** field. Be sure to include whether any extension modules were involved, and what hardware and software platform you were using (including version information -- Repository URL: http://hg.python.org/devguide

1 0

Daily reference leaks (6fdc5e3daa8c): sum=-1
by solipsis＠pitrou.net Nov. 30, 2012

Nov. 30, 2012

results for 6fdc5e3daa8c on branch "default" -------------------------------------------- test_support leaked [0, 0, -1] references, sum=-1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog0lpkJC', '-x']

1 0