Mailman 3 October 2012 - Python-Dev

Issue 8492 [was Re: [Python-dev] History stepping in interactive session?]
by Steven D'Aprano Oct. 11, 2012

Oct. 11, 2012

Over on python-ideas, a question about readline was raised and, I think, resolved. But while investigating the question, it became obvious to me that the ability to inspect the current readline bindings from Python was both useful and important. I wrote: > I don't believe that there is any direct mechanism for querying the current > readline bindings in Python, But it was requested some time ago: http://bugs.python.org/issue8492 Is there anyone willing and able to give this issue … [View More]

2 1

hg verify warnings
by Khalid Abu Bakr Oct. 11, 2012

Oct. 11, 2012

Hello. Running hg verify on a newly checked out cpython repo on Windows Vista 32Bits yields three warnings: $ hg verify repository uses revlog format 1 checking changesets checking manifests crosschecking files in changesets and manifests checking files warning: copy source of 'Modules/_threadmodule.c' not in parents of 60ad83716733 warning: copy source of 'Objects/bytesobject.c' not in parents of 64bb1d258322 warning: copy source of 'Objects/stringobject.c' not in parents of 357e268e7c5f … [View More]

2 1

Re: [Python-Dev] [Python-checkins] cpython (merge 3.2 -> 3.3): Fixes Issue #16114: The subprocess module no longer provides a
by Chris Jerdonek Oct. 10, 2012

Oct. 10, 2012

On Wed, Oct 10, 2012 at 3:52 AM, gregory.p.smith <python-checkins(a)python.org> wrote: > http://hg.python.org/cpython/rev/ee30d7ef70be > changeset: 79633:ee30d7ef70be > branch: 3.3 > parent: 79630:9451908da615 > parent: 79632:e938fa6be509 > user: Gregory P. Smith <greg(a)krypto.org> > date: Wed Oct 10 03:44:47 2012 -0700 > summary: > Fixes Issue #16114: The subprocess module no longer provides a > misleading error … [View More]message stating that args[0] did not exist when > either the cwd or executable keyword arguments specified a path that > did not exist. > + def test_exception_cwd(self): > + """Test error in the child raised in the parent for a bad cwd.""" > + desired_exception = self._get_chdir_exception() > try: > p = subprocess.Popen([sys.executable, "-c", ""], > - cwd=nonexistent_dir) > + cwd=self._nonexistent_dir) > except OSError as e: > # Test that the child process chdir failure actually makes > # it up to the parent process as the correct exception. > @@ -1064,6 +1070,33 @@ > else: > self.fail("Expected OSError: %s" % desired_exception) I was on this issue but didn't have an opportunity to comment. It would be cleaner to use the self.assertRaises() pattern here and also probably better to share code across the three test methods which are nearly identical to one another (there is a fourth scenario I would also add of shell=True). I would also check for FileNotFoundError instead of OSError in the 3.3 and later versions. --Chris > > + def test_exception_bad_executable(self): > + """Test error in the child raised in the parent for a bad executable.""" > + desired_exception = self._get_chdir_exception() > + try: > + p = subprocess.Popen([sys.executable, "-c", ""], > + executable=self._nonexistent_dir) > + except OSError as e: > + # Test that the child process exec failure actually makes > + # it up to the parent process as the correct exception. > + self.assertEqual(desired_exception.errno, e.errno) > + self.assertEqual(desired_exception.strerror, e.strerror) > + else: > + self.fail("Expected OSError: %s" % desired_exception) > + > + def test_exception_bad_args_0(self): > + """Test error in the child raised in the parent for a bad args[0].""" > + desired_exception = self._get_chdir_exception() > + try: > + p = subprocess.Popen([self._nonexistent_dir, "-c", ""]) > + except OSError as e: > + # Test that the child process exec failure actually makes > + # it up to the parent process as the correct exception. > + self.assertEqual(desired_exception.errno, e.errno) > + self.assertEqual(desired_exception.strerror, e.strerror) > + else: > + self.fail("Expected OSError: %s" % desired_exception) > + > def test_restore_signals(self): > # Code coverage for both values of restore_signals to make sure it > # at least does not blow up. > diff --git a/Misc/NEWS b/Misc/NEWS > --- a/Misc/NEWS > +++ b/Misc/NEWS > @@ -37,6 +37,10 @@ > Library > ------- > > +- Issue #16114: The subprocess module no longer provides a misleading error > + message stating that args[0] did not exist when either the cwd or executable > + keyword arguments specified a path that did not exist. > + > - Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror. > > - Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element > diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c > --- a/Modules/_posixsubprocess.c > +++ b/Modules/_posixsubprocess.c > @@ -356,7 +356,7 @@ > PyObject *preexec_fn, > PyObject *preexec_fn_args_tuple) > { > - int i, saved_errno, unused; > + int i, saved_errno, unused, reached_preexec = 0; > PyObject *result; > const char* err_msg = ""; > /* Buffer large enough to hold a hex integer. We can't malloc. */ > @@ -440,6 +440,7 @@ > POSIX_CALL(setsid()); > #endif > > + reached_preexec = 1; > if (preexec_fn != Py_None && preexec_fn_args_tuple) { > /* This is where the user has asked us to deadlock their program. */ > result = PyObject_Call(preexec_fn, preexec_fn_args_tuple, NULL); > @@ -489,6 +490,10 @@ > } > unused = write(errpipe_write, cur, hex_errno + sizeof(hex_errno) - cur); > unused = write(errpipe_write, ":", 1); > + if (!reached_preexec) { > + /* Indicate to the parent that the error happened before exec(). */ > + unused = write(errpipe_write, "noexec", 6); > + } > /* We can't call strerror(saved_errno). It is not async signal safe. > * The parent process will look the error message up. */ > } else { > > -- > Repository URL: http://hg.python.org/cpython > > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins > [View Less]

1 0

Failed issue tracker submission
by Python tracker Oct. 9, 2012

Oct. 9, 2012

The node specified by the designator in the subject of your message ("16712") does not exist. Subject was: "[issue16712] [status=closed; resolution=fixed; stage=committed/rejected]" Mail Gateway Help ================= Incoming messages are examined for multiple parts: . In a multipart/mixed message or part, each subpart is extracted and examined. The text/plain subparts are assembled to form the textual body of the message, to be stored in the file associated with a "msg" class … [View More]node. Any parts of other types are each stored in separate files and given "file" class nodes that are linked to the "msg" node. . In a multipart/alternative message or part, we look for a text/plain subpart and ignore the other parts. . A message/rfc822 is treated similar tomultipart/mixed (except for special handling of the first text part) if unpack_rfc822 is set in the mailgw config section. Summary ------- The "summary" property on message nodes is taken from the first non-quoting section in the message body. The message body is divided into sections by blank lines. Sections where the second and all subsequent lines begin with a ">" or "|" character are considered "quoting sections". The first line of the first non-quoting section becomes the summary of the message. Addresses --------- All of the addresses in the To: and Cc: headers of the incoming message are looked up among the user nodes, and the corresponding users are placed in the "recipients" property on the new "msg" node. The address in the From: header similarly determines the "author" property of the new "msg" node. The default handling for addresses that don't have corresponding users is to create new users with no passwords and a username equal to the address. (The web interface does not permit logins for users with no passwords.) If we prefer to reject mail from outside sources, we can simply register an auditor on the "user" class that prevents the creation of user nodes with no passwords. Actions ------- The subject line of the incoming message is examined to determine whether the message is an attempt to create a new item or to discuss an existing item. A designator enclosed in square brackets is sought as the first thing on the subject line (after skipping any "Fwd:" or "Re:" prefixes). If an item designator (class name and id number) is found there, the newly created "msg" node is added to the "messages" property for that item, and any new "file" nodes are added to the "files" property for the item. If just an item class name is found there, we attempt to create a new item of that class with its "messages" property initialized to contain the new "msg" node and its "files" property initialized to contain any new "file" nodes. Triggers -------- Both cases may trigger detectors (in the first case we are calling the set() method to add the message to the item's spool; in the second case we are calling the create() method to create a new node). If an auditor raises an exception, the original message is bounced back to the sender with the explanatory message given in the exception. Return-Path: <python-dev(a)python.org> X-Original-To: report(a)bugs.python.org Delivered-To: roundup+tracker(a)psf.upfronthosting.co.za Received: from mail.python.org (mail.python.org [82.94.164.166]) by psf.upfronthosting.co.za (Postfix) with ESMTPS id 93DC71CDEC for <report(a)bugs.python.org>; Tue, 9 Oct 2012 17:16:41 +0200 (CEST) Received: from albatross.python.org (localhost [127.0.0.1]) by mail.python.org (Postfix) with ESMTP id 3XbhqY1FH2zR2h for <report(a)bugs.python.org>; Tue, 9 Oct 2012 17:16:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=python.org; s=200901; t=1349795801; bh=iCK/DXUZXT5YdN3qczalnWeJLXZntJSOwSJCLK4oXiY=; h=MIME-Version:Content-Type:Content-Transfer-Encoding:From:To: Subject:Message-Id:Date; b=SI5InhadwHC9jRtzWowdxRNjdaicnEoMCQwjiei8u4Bm5ENmn1E+BWLOHeXlEnVXE x7UffWiTa3swqNHrNtoNoChufCekDEvPkRE8uGsAp8gwxAQkVzZbjhIaq3P25Npl2v gIbfbBuyMBoq1R/lr9yJ2XY/mCRLfZ3X/p2bWHTk= Received: from localhost (HELO mail.python.org) (127.0.0.1) by albatross.python.org with SMTP; 09 Oct 2012 17:16:41 +0200 Received: from virt-7yvsjn.psf.osuosl.org (virt-7yvsjn.psf.osuosl.org [140.211.10.72]) by mail.python.org (Postfix) with ESMTP for <report(a)bugs.python.org>; Tue, 9 Oct 2012 17:16:40 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 From: python-dev(a)python.org To: report(a)bugs.python.org Subject: [issue16712] [status=closed; resolution=fixed; stage=committed/rejected] Message-Id: <3XbhqY1FH2zR2h(a)mail.python.org> Date: Tue, 9 Oct 2012 17:16:41 +0200 (CEST) TmV3IGNoYW5nZXNldCAzMzJiOTNjZTdiZjkgYnkgQmVuamFtaW4gUGV0ZXJzb24gaW4gYnJhbmNo ICczLjMnOgpjb21wYXJlIHNpbmdsZXRvbnMgYnkgaWRlbnRpdHkgbm90IGVxdWFsaXR5IChjbG9z ZXMgIzE2NzEyKQpodHRwOi8vaGcucHl0aG9uLm9yZy9jcHl0aG9uL3Jldi8zMzJiOTNjZTdiZjkK [View Less]

1 0

Issue #16153: PyUnicode_FromFormatV() must fail if the format string is invalid
by Victor Stinner Oct. 8, 2012

Oct. 8, 2012

Hi, Does anyone know if there is a good reason why PyUnicode_FromFormatV() does not fail on invalid format string, but copies the format string as-if into the result? I would like to change this to raise a ValueError instead. PyUnicode_FromFormatV() is used by PyErr_Format(), so PyErr_Format() may now fail with a ValueError if the format string is invalid. Victor

3 4

Re: [Python-Dev] cpython: Issue #16148: implemented PEP 424
by Antoine Pitrou Oct. 6, 2012

Oct. 6, 2012

On Sat, 6 Oct 2012 14:12:36 +0200 (CEST) armin.ronacher <python-checkins(a)python.org> wrote: > http://hg.python.org/cpython/rev/a7ec0a1b0f7c > changeset: 79511:a7ec0a1b0f7c > parent: 79507:3c1df1ede882 > user: Armin Ronacher <armin.ronacher(a)active-4.com> > date: Sat Oct 06 14:03:24 2012 +0200 > summary: > Issue #16148: implemented PEP 424 > [...] > > +.. c:function:: Py_ssize_t PyObject_LengthHint(PyObject *o, Py_ssize_t … [View More]default) > + > + Return an estimated length for the object *o*. First trying to return its > + actual length, then an estimate using ``__length_hint__``, and finally > + returning the default value. On error ``-1`` is returned. This is the > + equivalent to the Python expression ``operator.length_hint(o, default)``. > + You need a "versionadded" marker. > +.. function:: length_hint(obj, default=0) > + > + Return an estimated length for the object *o*. First trying to return its > + actual length, then an estimate using ``__length_hint__``, and finally > + returning the default value. > + Here as well. > -#ifndef Py_LIMITED_API > - PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t); > -#endif > +PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o); > +PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t); If _PyObject_HasLen is private, it shouldn't be in the Py_LIMITED_API. > diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py > --- a/Lib/test/test_enumerate.py > +++ b/Lib/test/test_enumerate.py > @@ -1,4 +1,5 @@ > import unittest > +import operator > import sys > import pickle > > @@ -168,15 +169,13 @@ > x = range(1) > self.assertEqual(type(reversed(x)), type(iter(x))) > > - @support.cpython_only > def test_len(self): > # This is an implementation detail, not an interface requirement > - from test.test_iterlen import len > for s in ('hello', tuple('hello'), list('hello'), range(5)): > - self.assertEqual(len(reversed(s)), len(s)) > + self.assertEqual(operator.length_hint(reversed(s)), len(s)) You should still test len() as well, no? > + else { > + return res; > + } > + PyObject *hint = _PyObject_LookupSpecial(o, &PyId___length_hint__); Putting variable declarations in the middle of code blocks is not C89-compliant. You probably broke a couple of buildbots :-) > + if (_PyObject_HasLen(it->it_seq)) { > + seqsize = PySequence_Size(it->it_seq); > + if (seqsize == -1) > + return NULL; > + } > + else { > + return Py_NotImplemented; > + } Lacks a Py_INCREF? Regards Antoine. -- Software development and contracting: http://pro.pitrou.net [View Less]

1 0

Re: [Python-Dev] cpython: Issue #16148: implemented PEP 424
by Georg Brandl Oct. 6, 2012

Oct. 6, 2012

Am 06.10.2012 14:12, schrieb armin.ronacher: > http://hg.python.org/cpython/rev/a7ec0a1b0f7c > changeset: 79511:a7ec0a1b0f7c > parent: 79507:3c1df1ede882 > user: Armin Ronacher <armin.ronacher(a)active-4.com> > date: Sat Oct 06 14:03:24 2012 +0200 > summary: > Issue #16148: implemented PEP 424 > > files: > Doc/c-api/object.rst | 7 ++ > Doc/library/operator.rst | 6 + > Include/abstract.h | 5 +- > … [View More]Lib/test/test_enumerate.py | 9 +- > Lib/test/test_iterlen.py | 62 +++++++++---------- > Lib/test/test_itertools.py | 5 +- > Lib/test/test_operator.py | 25 ++++++++ > Lib/test/test_set.py | 2 - > Modules/operator.c | 27 ++++++++ > Objects/abstract.c | 80 +++++++++++++++---------- > Objects/bytearrayobject.c | 2 +- > Objects/bytesobject.c | 2 +- > Objects/iterobject.c | 11 ++- > Objects/listobject.c | 2 +- > 14 files changed, 162 insertions(+), 83 deletions(-) > > > diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst > --- a/Doc/c-api/object.rst > +++ b/Doc/c-api/object.rst > @@ -342,6 +342,13 @@ > returned. This is the equivalent to the Python expression ``len(o)``. > > > +.. c:function:: Py_ssize_t PyObject_LengthHint(PyObject *o, Py_ssize_t default) > + > + Return an estimated length for the object *o*. First trying to return its > + actual length, then an estimate using ``__length_hint__``, and finally > + returning the default value. On error ``-1`` is returned. This is the > + equivalent to the Python expression ``operator.length_hint(o, default)``. Needs a versionadded. Since __length_hint__ is now official, it needs an entry in Doc/reference/datamodel.rst (which you can link to here.) > .. c:function:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key) > > Return element of *o* corresponding to the object *key* or *NULL* on failure. > diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst > --- a/Doc/library/operator.rst > +++ b/Doc/library/operator.rst > @@ -235,6 +235,12 @@ > > .. XXX: find a better, readable, example > > +.. function:: length_hint(obj, default=0) > + > + Return an estimated length for the object *o*. First trying to return its > + actual length, then an estimate using ``__length_hint__``, and finally > + returning the default value. This one also needs versionadded and a link to __length_hint__. > The :mod:`operator` module also defines tools for generalized attribute and item > lookups. These are useful for making fast field extractors as arguments for > :func:`map`, :func:`sorted`, :meth:`itertools.groupby`, or other functions that > diff --git a/Include/abstract.h b/Include/abstract.h > --- a/Include/abstract.h > +++ b/Include/abstract.h > @@ -403,9 +403,8 @@ > PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o); > #define PyObject_Length PyObject_Size > > -#ifndef Py_LIMITED_API > - PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t); > -#endif > +PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o); > +PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t); Not sure if new functions should be included in the limited API. I seem to recall some discussion about giving Py_LIMITED_API a numeric value for the required API version? PEP 384 is silent about it. > /* > Guess the size of object o using len(o) or o.__length_hint__(). > diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py > --- a/Lib/test/test_enumerate.py > +++ b/Lib/test/test_enumerate.py > @@ -1,4 +1,5 @@ > import unittest > +import operator > import sys > import pickle > > @@ -168,15 +169,13 @@ > x = range(1) > self.assertEqual(type(reversed(x)), type(iter(x))) > > - @support.cpython_only > def test_len(self): > # This is an implementation detail, not an interface requirement If it's not cpython_only anymore, this comment should also vanish? > - from test.test_iterlen import len > for s in ('hello', tuple('hello'), list('hello'), range(5)): > - self.assertEqual(len(reversed(s)), len(s)) > + self.assertEqual(operator.length_hint(reversed(s)), len(s)) > r = reversed(s) > list(r) > - self.assertEqual(len(r), 0) > + self.assertEqual(operator.length_hint(r), 0) > class SeqWithWeirdLen: > called = False > def __len__(self): > @@ -187,7 +186,7 @@ > def __getitem__(self, index): > return index > r = reversed(SeqWithWeirdLen()) > - self.assertRaises(ZeroDivisionError, len, r) > + self.assertRaises(ZeroDivisionError, operator.length_hint, r) > > > def test_gc(self): > diff --git a/Lib/test/test_iterlen.py b/Lib/test/test_iterlen.py > --- a/Lib/test/test_iterlen.py > +++ b/Lib/test/test_iterlen.py > @@ -45,31 +45,21 @@ > from test import support > from itertools import repeat > from collections import deque > -from builtins import len as _len > +from operator import length_hint > ## ------- Concrete Type Tests ------- > > @@ -92,10 +82,6 @@ > def setUp(self): > self.it = repeat(None, n) > > - def test_no_len_for_infinite_repeat(self): > - # The repeat() object can also be infinite > - self.assertRaises(TypeError, len, repeat(None)) Why is this removed? I can see it was duplicated in test_itertools (below), but you removed both instances. > diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py > --- a/Lib/test/test_itertools.py > +++ b/Lib/test/test_itertools.py > @@ -1723,9 +1723,8 @@ > class LengthTransparency(unittest.TestCase): > > def test_repeat(self): > - from test.test_iterlen import len > - self.assertEqual(len(repeat(None, 50)), 50) > - self.assertRaises(TypeError, len, repeat(None)) > + self.assertEqual(operator.length_hint(repeat(None, 50)), 50) > + self.assertEqual(operator.length_hint(repeat(None), 12), 12) > > class RegressionTests(unittest.TestCase): > > diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py > --- a/Lib/test/test_operator.py > +++ b/Lib/test/test_operator.py > @@ -410,6 +410,31 @@ > self.assertEqual(operator.__ixor__ (c, 5), "ixor") > self.assertEqual(operator.__iconcat__ (c, c), "iadd") > > + def test_length_hint(self): > + class X(object): > + def __init__(self, value): > + self.value = value > + > + def __length_hint__(self): > + if type(self.value) is type: > + raise self.value > + else: > + return self.value > + > + self.assertEqual(operator.length_hint([], 2), 0) > + self.assertEqual(operator.length_hint(iter([1, 2, 3])), 3) > + > + self.assertEqual(operator.length_hint(X(2)), 2) > + self.assertEqual(operator.length_hint(X(NotImplemented), 4), 4) > + self.assertEqual(operator.length_hint(X(TypeError), 12), 12) > + with self.assertRaises(TypeError): > + operator.length_hint(X("abc")) > + with self.assertRaises(ValueError): > + operator.length_hint(X(-2)) > + with self.assertRaises(LookupError): > + operator.length_hint(X(LookupError)) > + > + > def test_main(verbose=None): > import sys > test_classes = ( > diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py > --- a/Lib/test/test_set.py > +++ b/Lib/test/test_set.py > @@ -848,8 +848,6 @@ > for v in self.set: > self.assertIn(v, self.values) > setiter = iter(self.set) > - # note: __length_hint__ is an internal undocumented API, > - # don't rely on it in your own programs > self.assertEqual(setiter.__length_hint__(), len(self.set)) > > def test_pickling(self): > diff --git a/Modules/operator.c b/Modules/operator.c > --- a/Modules/operator.c > +++ b/Modules/operator.c > @@ -208,6 +208,31 @@ > return (result == 0); > } > > +PyDoc_STRVAR(length_hint__doc__, > +"length_hint(obj, default=0) -> int\n" > +"Return an estimate of the number of items in obj.\n" > +"This is useful for presizing containers when building from an\n" > +"iterable.\n" > +"\n" > +"If the object supports len(), the result will be\n" > +"exact. Otherwise, it may over- or under-estimate by an\n" > +"arbitrary amount. The result will be an integer >= 0."); > + > +static PyObject *length_hint(PyObject *self, PyObject *args) > +{ > + PyObject *obj; > + Py_ssize_t defaultvalue = 0, res; > + if (!PyArg_ParseTuple(args, "O|n:length_hint", &obj, &defaultvalue)) { > + return NULL; > + } > + res = PyObject_LengthHint(obj, defaultvalue); > + if (res == -1 && PyErr_Occurred()) { > + return NULL; > + } > + return PyLong_FromSsize_t(res); > +} > + > + > PyDoc_STRVAR(compare_digest__doc__, > "compare_digest(a, b) -> bool\n" > "\n" > @@ -366,6 +391,8 @@ > > {"_compare_digest", (PyCFunction)compare_digest, METH_VARARGS, > compare_digest__doc__}, > + {"length_hint", (PyCFunction)length_hint, METH_VARARGS, > + length_hint__doc__}, > {NULL, NULL} /* sentinel */ > > }; > diff --git a/Objects/abstract.c b/Objects/abstract.c > --- a/Objects/abstract.c > +++ b/Objects/abstract.c > @@ -64,49 +64,67 @@ > } > #define PyObject_Length PyObject_Size > > +int > +_PyObject_HasLen(PyObject *o) { > + return (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_length) || > + (Py_TYPE(o)->tp_as_mapping && Py_TYPE(o)->tp_as_mapping->mp_length); > +} > > /* The length hint function returns a non-negative value from o.__len__() > - or o.__length_hint__(). If those methods aren't found or return a negative > - value, then the defaultvalue is returned. If one of the calls fails, > - this function returns -1. > + or o.__length_hint__(). If those methods aren't found. If one of the calls ^^^^^ Sentence incomplete. > + fails this function returns -1. > */ > > Py_ssize_t > -_PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) > +PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) Should we put "#define _PyObject_LengthHint PyObject_LengthHint" in some header to make porting easier? > { > _Py_IDENTIFIER(__length_hint__); > - PyObject *ro, *hintmeth; > - Py_ssize_t rv; > - > - /* try o.__len__() */ > - rv = PyObject_Size(o); > - if (rv >= 0) > - return rv; > - if (PyErr_Occurred()) { > - if (!PyErr_ExceptionMatches(PyExc_TypeError)) > + Py_ssize_t res = PyObject_Length(o); > + if (res < 0 && PyErr_Occurred()) { > + if (!PyErr_ExceptionMatches(PyExc_TypeError)) { > return -1; > + } > PyErr_Clear(); > } > - > - /* try o.__length_hint__() */ > - hintmeth = _PyObject_LookupSpecial(o, &PyId___length_hint__); > - if (hintmeth == NULL) { > - if (PyErr_Occurred()) > + else { > + return res; > + } > + PyObject *hint = _PyObject_LookupSpecial(o, &PyId___length_hint__); > + if (hint == NULL) { > + if (PyErr_Occurred()) { > return -1; > - else > - return defaultvalue; > - } > - ro = PyObject_CallFunctionObjArgs(hintmeth, NULL); > - Py_DECREF(hintmeth); > - if (ro == NULL) { > - if (!PyErr_ExceptionMatches(PyExc_TypeError)) > - return -1; > - PyErr_Clear(); > + } > return defaultvalue; > } > - rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue; > - Py_DECREF(ro); > - return rv; > + PyObject *result = PyObject_CallFunctionObjArgs(hint, NULL); > + Py_DECREF(hint); > + if (result == NULL) { > + if (PyErr_ExceptionMatches(PyExc_TypeError)) { > + PyErr_Clear(); > + return defaultvalue; > + } > + return -1; > + } > + else if (result == Py_NotImplemented) { > + Py_DECREF(result); > + return defaultvalue; > + } > + if (!PyLong_Check(result)) { > + PyErr_Format(PyExc_TypeError, "Length hint must be an integer, not %s", We usually limit the string size here, e.g. "%.100s". > + Py_TYPE(result)->tp_name); > + Py_DECREF(result); > + return -1; > + } > + defaultvalue = PyLong_AsSsize_t(result); Not sure the micro-optimization is worth the confusion of reassigning defaultvalue. > + Py_DECREF(result); > + if (defaultvalue < 0 && PyErr_Occurred()) { > + return -1; > + } > + if (defaultvalue < 0) { > + PyErr_Format(PyExc_ValueError, "__length_hint__() should return >= 0"); Exception message is inconsistent with above: "Length hint" vs "__length_hint__()". > + return -1; > + } > + return defaultvalue; > } > diff --git a/Objects/iterobject.c b/Objects/iterobject.c > --- a/Objects/iterobject.c > +++ b/Objects/iterobject.c > @@ -76,9 +76,14 @@ > Py_ssize_t seqsize, len; > > if (it->it_seq) { > - seqsize = PySequence_Size(it->it_seq); > - if (seqsize == -1) > - return NULL; > + if (_PyObject_HasLen(it->it_seq)) { > + seqsize = PySequence_Size(it->it_seq); > + if (seqsize == -1) > + return NULL; > + } > + else { > + return Py_NotImplemented; An INCREF is missing here, as discussed on IRC. > + } > len = seqsize - it->it_index; > if (len >= 0) > return PyLong_FromSsize_t(len); [View Less]

1 0

Should vars() return modifiable dict?
by Serhiy Storchaka Oct. 5, 2012

Oct. 5, 2012

For objects with __dict__ vars() returns modifiable dict: >>> class A(): ... pass ... >>> a = A() >>> a.x = 42 >>> vars(a) {'x': 42} >>> vars(a)['x'] = 43 >>> vars(a)['y'] = 44 >>> a.x, a.y, vars(a) (43, 44, {'y': 44, 'x': 43}) For globals vars() returns modifiable dict: >>> x = 42 >>> vars()['x'] 42 >>> vars()['x'] = 43 >>> vars()['y'] = 44 >>> vars()['x'], vars()['y'] … [View More]

6 7

Summary of Python tracker Issues
by Python tracker Oct. 5, 2012

Oct. 5, 2012

ACTIVITY SUMMARY (2012-09-28 - 2012-10-05) Python tracker at http://bugs.python.org/ To view or respond to any of the issues listed below, click on the issue. Do NOT respond to this message. Issues counts and deltas: open 3770 (+16) closed 24149 (+43) total 27919 (+59) Open issues with patches: 1676 Issues opened (44) ================== #3982: support .format for bytes http://bugs.python.org/issue3982 reopened by exarkun #15111: Wrong ImportError message with importlib http://… [View More]

1 0

Re: [Python-Dev] [Python-checkins] cpython: Issue #14446: Remove deprecated tkinter functions: Delete an unused function to
by Andrew Svetlov Oct. 5, 2012

Oct. 5, 2012

Thank you, Jesus. I've missed this function. On Fri, Oct 5, 2012 at 5:03 AM, jesus.cea <python-checkins(a)python.org> wrote: > http://hg.python.org/cpython/rev/e278f3ab0190 > changeset: 79484:e278f3ab0190 > user: Jesus Cea <jcea(a)jcea.es> > date: Fri Oct 05 04:02:41 2012 +0200 > summary: > Issue #14446: Remove deprecated tkinter functions: Delete an unused function to avoid a warning > > files: > Modules/_tkinter.c | 30 --------------… [View More]

1 0