Mailman 3 September 2011 - Python-checkins

distutils2: Remove unused name
by eric.araujo Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/distutils2/rev/f3b2b4a15fef changeset: 1189:f3b2b4a15fef user: Éric Araujo <merwok(a)netwok.org> date: Fri Sep 23 23:56:32 2011 +0200 summary: Remove unused name files: distutils2/pypi/xmlrpc.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/distutils2/pypi/xmlrpc.py b/distutils2/pypi/xmlrpc.py --- a/distutils2/pypi/xmlrpc.py +++ b/distutils2/pypi/xmlrpc.py @@ -6,7 +6,7 @@ implementation at http://wiki.python.org/moin/… [View More]

1 0

cpython: Issue #1621: Fix undefined behaviour from signed overflow in get_integer
by mark.dickinson Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/cpython/rev/5e456e1a9e8c changeset: 72466:5e456e1a9e8c user: Mark Dickinson <mdickinson(a)enthought.com> date: Sat Sep 24 19:11:53 2011 +0100 summary: Issue #1621: Fix undefined behaviour from signed overflow in get_integer (stringlib/formatter.h) files: Objects/stringlib/formatter.h | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Objects/stringlib/formatter.h b/Objects/stringlib/formatter.h --- a/Objects/… [View More]

1 0

cpython: Issue #1621: Fix undefined behaviour in bytes.__hash__, str.__hash__,
by mark.dickinson Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/cpython/rev/698fa089ce70 changeset: 72464:698fa089ce70 user: Mark Dickinson <mdickinson(a)enthought.com> date: Sat Sep 24 18:18:40 2011 +0100 summary: Issue #1621: Fix undefined behaviour in bytes.__hash__, str.__hash__, tuple.__hash__, frozenset.__hash__ and set indexing operations. files: Objects/bytesobject.c | 8 ++++---- Objects/dictobject.c | 4 ++-- Objects/setobject.c | 20 ++++++++++---------- Objects/tupleobject.c | … [View More]9 +++++---- Objects/unicodeobject.c | 10 +++++----- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -869,16 +869,16 @@ { register Py_ssize_t len; register unsigned char *p; - register Py_hash_t x; + register Py_uhash_t x; if (a->ob_shash != -1) return a->ob_shash; len = Py_SIZE(a); p = (unsigned char *) a->ob_sval; - x = *p << 7; + x = (Py_uhash_t)*p << 7; while (--len >= 0) - x = (1000003*x) ^ *p++; - x ^= Py_SIZE(a); + x = (1000003U*x) ^ (Py_uhash_t)*p++; + x ^= (Py_uhash_t)Py_SIZE(a); if (x == -1) x = -2; a->ob_shash = x; diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -418,7 +418,7 @@ mp->ma_lookup = lookdict; return lookdict(mp, key, hash); } - i = hash & mask; + i = (size_t)hash & mask; ep = &ep0[i]; if (ep->me_key == NULL || ep->me_key == key) return ep; @@ -572,7 +572,7 @@ register PyDictEntry *ep; MAINTAIN_TRACKING(mp, key, value); - i = hash & mask; + i = (size_t)hash & mask; ep = &ep0[i]; for (perturb = hash; ep->me_key != NULL; perturb >>= PERTURB_SHIFT) { i = (i << 2) + i + perturb + 1; diff --git a/Objects/setobject.c b/Objects/setobject.c --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -77,7 +77,7 @@ static setentry * set_lookkey(PySetObject *so, PyObject *key, register Py_hash_t hash) { - register Py_ssize_t i; + register size_t i; register size_t perturb; register setentry *freeslot; register size_t mask = so->mask; @@ -86,7 +86,7 @@ register int cmp; PyObject *startkey; - i = hash & mask; + i = (size_t)hash & mask; entry = &table[i]; if (entry->key == NULL || entry->key == key) return entry; @@ -159,7 +159,7 @@ static setentry * set_lookkey_unicode(PySetObject *so, PyObject *key, register Py_hash_t hash) { - register Py_ssize_t i; + register size_t i; register size_t perturb; register setentry *freeslot; register size_t mask = so->mask; @@ -174,7 +174,7 @@ so->lookup = set_lookkey; return set_lookkey(so, key, hash); } - i = hash & mask; + i = (size_t)hash & mask; entry = &table[i]; if (entry->key == NULL || entry->key == key) return entry; @@ -256,7 +256,7 @@ setentry *table = so->table; register setentry *entry; - i = hash & mask; + i = (size_t)hash & mask; entry = &table[i]; for (perturb = hash; entry->key != NULL; perturb >>= PERTURB_SHIFT) { i = (i << 2) + i + perturb + 1; @@ -770,14 +770,14 @@ frozenset_hash(PyObject *self) { PySetObject *so = (PySetObject *)self; - Py_hash_t h, hash = 1927868237L; + Py_uhash_t h, hash = 1927868237U; setentry *entry; Py_ssize_t pos = 0; if (so->hash != -1) return so->hash; - hash *= PySet_GET_SIZE(self) + 1; + hash *= (Py_uhash_t)PySet_GET_SIZE(self) + 1; while (set_next(so, &pos, &entry)) { /* Work to increase the bit dispersion for closely spaced hash values. The is important because some use cases have many @@ -785,11 +785,11 @@ hashes so that many distinct combinations collapse to only a handful of distinct hash values. */ h = entry->hash; - hash ^= (h ^ (h << 16) ^ 89869747L) * 3644798167u; + hash ^= (h ^ (h << 16) ^ 89869747U) * 3644798167U; } - hash = hash * 69069L + 907133923L; + hash = hash * 69069U + 907133923U; if (hash == -1) - hash = 590923713L; + hash = 590923713U; so->hash = hash; return hash; } diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -315,11 +315,12 @@ static Py_hash_t tuplehash(PyTupleObject *v) { - register Py_hash_t x, y; + register Py_uhash_t x; + register Py_hash_t y; register Py_ssize_t len = Py_SIZE(v); register PyObject **p; - Py_hash_t mult = 1000003L; - x = 0x345678L; + Py_uhash_t mult = 1000003; + x = 0x345678; p = v->ob_item; while (--len >= 0) { y = PyObject_Hash(*p++); @@ -330,7 +331,7 @@ mult += (Py_hash_t)(82520L + len + len); } x += 97531L; - if (x == -1) + if (x == (Py_uhash_t)-1) x = -2; return x; } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -7721,22 +7721,22 @@ } /* Believe it or not, this produces the same value for ASCII strings - as string_hash(). */ + as bytes_hash(). */ static Py_hash_t unicode_hash(PyUnicodeObject *self) { Py_ssize_t len; Py_UNICODE *p; - Py_hash_t x; + Py_uhash_t x; if (self->hash != -1) return self->hash; len = Py_SIZE(self); p = self->str; - x = *p << 7; + x = (Py_uhash_t)*p << 7; while (--len >= 0) - x = (1000003*x) ^ *p++; - x ^= Py_SIZE(self); + x = (1000003U*x) ^ (Py_uhash_t)*p++; + x ^= (Py_uhash_t)Py_SIZE(self); if (x == -1) x = -2; self->hash = x; -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython: Fix typo in comment: _PyHash_Double -> _Py_HashDouble.
by mark.dickinson Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/cpython/rev/ac79caff7d6d changeset: 72463:ac79caff7d6d user: Mark Dickinson <mdickinson(a)enthought.com> date: Sat Sep 24 16:24:56 2011 +0100 summary: Fix typo in comment: _PyHash_Double -> _Py_HashDouble. files: Include/pyport.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h --- a/Include/pyport.h +++ b/Include/pyport.h @@ -132,7 +132,7 @@ #endif /* Parameters used for the … [View More]

1 0

hooks: Allow configuring a different sender (needed for stackless repo, where the
by local Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/hooks/rev/2e98611111f1 changeset: 77:2e98611111f1 user: Georg Brandl <georg(a)python.org> date: Sat Sep 24 13:40:00 2011 +0200 summary: Allow configuring a different sender (needed for stackless repo, where the notification goes to an address at a different domain). files: mail.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/mail.py b/mail.py --- a/mail.py +++ b/mail.py @@ -76,7 +76,10 @@ if to is None: … [View More]

1 0

cpython: Issue #13012: Allow 'keepends' to be passed as a keyword argument in
by mark.dickinson Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/cpython/rev/0b2660384d4e changeset: 72462:0b2660384d4e parent: 72460:18eec56bcf29 user: Mark Dickinson <mdickinson(a)enthought.com> date: Sat Sep 24 09:14:39 2011 +0100 summary: Issue #13012: Allow 'keepends' to be passed as a keyword argument in str.splitlines, bytes.splitlines and bytearray.splitlines. files: Lib/test/buffer_tests.py | 8 +++++++- Lib/test/string_tests.py | 14 +++++++++++--- Lib/test/test_userstring.py | 4 ++--… [View More] Misc/NEWS | 4 ++++ Objects/bytearrayobject.c | 10 ++++++---- Objects/bytesobject.c | 8 +++++--- Objects/unicodeobject.c | 10 ++++++---- 7 files changed, 41 insertions(+), 17 deletions(-) diff --git a/Lib/test/buffer_tests.py b/Lib/test/buffer_tests.py --- a/Lib/test/buffer_tests.py +++ b/Lib/test/buffer_tests.py @@ -200,7 +200,13 @@ self.marshal(b'abc\ndef\r\nghi\n\r').splitlines()) self.assertEqual([b'', b'abc', b'def', b'ghi', b''], self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines()) + self.assertEqual([b'', b'abc', b'def', b'ghi', b''], + self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines(False)) self.assertEqual([b'\n', b'abc\n', b'def\r\n', b'ghi\n', b'\r'], - self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines(1)) + self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines(True)) + self.assertEqual([b'', b'abc', b'def', b'ghi', b''], + self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines(keepends=False)) + self.assertEqual([b'\n', b'abc\n', b'def\r\n', b'ghi\n', b'\r'], + self.marshal(b'\nabc\ndef\r\nghi\n\r').splitlines(keepends=True)) self.assertRaises(TypeError, self.marshal(b'abc').splitlines, 42, 42) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -47,11 +47,12 @@ return obj # check that obj.method(*args) returns result - def checkequal(self, result, obj, methodname, *args): + def checkequal(self, result, obj, methodname, *args, **kwargs): result = self.fixtype(result) obj = self.fixtype(obj) args = self.fixtype(args) - realresult = getattr(obj, methodname)(*args) + kwargs = self.fixtype(kwargs) + realresult = getattr(obj, methodname)(*args, **kwargs) self.assertEqual( result, realresult @@ -908,7 +909,14 @@ self.checkequal(['abc', 'def', 'ghi'], "abc\ndef\r\nghi\n", 'splitlines') self.checkequal(['abc', 'def', 'ghi', ''], "abc\ndef\r\nghi\n\r", 'splitlines') self.checkequal(['', 'abc', 'def', 'ghi', ''], "\nabc\ndef\r\nghi\n\r", 'splitlines') - self.checkequal(['\n', 'abc\n', 'def\r\n', 'ghi\n', '\r'], "\nabc\ndef\r\nghi\n\r", 'splitlines', 1) + self.checkequal(['', 'abc', 'def', 'ghi', ''], + "\nabc\ndef\r\nghi\n\r", 'splitlines', False) + self.checkequal(['\n', 'abc\n', 'def\r\n', 'ghi\n', '\r'], + "\nabc\ndef\r\nghi\n\r", 'splitlines', True) + self.checkequal(['', 'abc', 'def', 'ghi', ''], "\nabc\ndef\r\nghi\n\r", + 'splitlines', keepends=False) + self.checkequal(['\n', 'abc\n', 'def\r\n', 'ghi\n', '\r'], + "\nabc\ndef\r\nghi\n\r", 'splitlines', keepends=True) self.checkraises(TypeError, 'abc', 'splitlines', 42, 42) diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py --- a/Lib/test/test_userstring.py +++ b/Lib/test/test_userstring.py @@ -17,11 +17,11 @@ # Overwrite the three testing methods, because UserString # can't cope with arguments propagated to UserString # (and we don't test with subclasses) - def checkequal(self, result, object, methodname, *args): + def checkequal(self, result, object, methodname, *args, **kwargs): result = self.fixtype(result) object = self.fixtype(object) # we don't fix the arguments, because UserString can't cope with it - realresult = getattr(object, methodname)(*args) + realresult = getattr(object, methodname)(*args, **kwargs) self.assertEqual( result, realresult diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #13012: The 'keepends' parameter to str.splitlines may now be passed + as a keyword argument: "my_string.splitlines(keepends=True)". The same + change also applies to bytes.splitlines and bytearray.splitlines. + - Issue #7732: Don't open a directory as a file anymore while importing a module. Ignore the direcotry if its name matchs the module name (e.g. "__init__.py") and raise a ImportError instead. diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2608,11 +2608,13 @@ is given and true."); static PyObject* -bytearray_splitlines(PyObject *self, PyObject *args) +bytearray_splitlines(PyObject *self, PyObject *args, PyObject *kwds) { + static char *kwlist[] = {"keepends", 0}; int keepends = 0; - if (!PyArg_ParseTuple(args, "|i:splitlines", &keepends)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i:splitlines", + kwlist, &keepends)) return NULL; return stringlib_splitlines( @@ -2801,8 +2803,8 @@ {"rsplit", (PyCFunction)bytearray_rsplit, METH_VARARGS, rsplit__doc__}, {"rstrip", (PyCFunction)bytearray_rstrip, METH_VARARGS, rstrip__doc__}, {"split", (PyCFunction)bytearray_split, METH_VARARGS, split__doc__}, - {"splitlines", (PyCFunction)bytearray_splitlines, METH_VARARGS, - splitlines__doc__}, + {"splitlines", (PyCFunction)bytearray_splitlines, + METH_VARARGS | METH_KEYWORDS, splitlines__doc__}, {"startswith", (PyCFunction)bytearray_startswith, METH_VARARGS , startswith__doc__}, {"strip", (PyCFunction)bytearray_strip, METH_VARARGS, strip__doc__}, diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2312,11 +2312,13 @@ is given and true."); static PyObject* -bytes_splitlines(PyObject *self, PyObject *args) +bytes_splitlines(PyObject *self, PyObject *args, PyObject *kwds) { + static char *kwlist[] = {"keepends", 0}; int keepends = 0; - if (!PyArg_ParseTuple(args, "|i:splitlines", &keepends)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i:splitlines", + kwlist, &keepends)) return NULL; return stringlib_splitlines( @@ -2458,7 +2460,7 @@ {"rsplit", (PyCFunction)bytes_rsplit, METH_VARARGS, rsplit__doc__}, {"rstrip", (PyCFunction)bytes_rstrip, METH_VARARGS, rstrip__doc__}, {"split", (PyCFunction)bytes_split, METH_VARARGS, split__doc__}, - {"splitlines", (PyCFunction)bytes_splitlines, METH_VARARGS, + {"splitlines", (PyCFunction)bytes_splitlines, METH_VARARGS | METH_KEYWORDS, splitlines__doc__}, {"startswith", (PyCFunction)bytes_startswith, METH_VARARGS, startswith__doc__}, diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -8881,11 +8881,13 @@ is given and true."); static PyObject* -unicode_splitlines(PyUnicodeObject *self, PyObject *args) -{ +unicode_splitlines(PyUnicodeObject *self, PyObject *args, PyObject *kwds) +{ + static char *kwlist[] = {"keepends", 0}; int keepends = 0; - if (!PyArg_ParseTuple(args, "|i:splitlines", &keepends)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i:splitlines", + kwlist, &keepends)) return NULL; return PyUnicode_Splitlines((PyObject *)self, keepends); @@ -9273,7 +9275,7 @@ {"rjust", (PyCFunction) unicode_rjust, METH_VARARGS, rjust__doc__}, {"rstrip", (PyCFunction) unicode_rstrip, METH_VARARGS, rstrip__doc__}, {"rpartition", (PyCFunction) unicode_rpartition, METH_O, rpartition__doc__}, - {"splitlines", (PyCFunction) unicode_splitlines, METH_VARARGS, splitlines__doc__}, + {"splitlines", (PyCFunction) unicode_splitlines, METH_VARARGS | METH_KEYWORDS, splitlines__doc__}, {"strip", (PyCFunction) unicode_strip, METH_VARARGS, strip__doc__}, {"swapcase", (PyCFunction) unicode_swapcase, METH_NOARGS, swapcase__doc__}, {"translate", (PyCFunction) unicode_translate, METH_O, translate__doc__}, -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython (2.7): Backport issue #12973 itertools fix from 3.x.
by mark.dickinson Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/cpython/rev/5a1cb8506cea changeset: 72461:5a1cb8506cea branch: 2.7 parent: 72456:0f5b64630fda user: Mark Dickinson <mdickinson(a)enthought.com> date: Sat Sep 24 09:01:16 2011 +0100 summary: Backport issue #12973 itertools fix from 3.x. files: Misc/NEWS | 6 +++--- Modules/itertoolsmodule.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ … [View More]

1 0

cpython (3.2): Issue #12973: Fix itertools bug caused by signed integer overflow. Thanks
by mark.dickinson Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/cpython/rev/b378864d8ff3 changeset: 72459:b378864d8ff3 branch: 3.2 parent: 72457:db8027df8458 user: Mark Dickinson <mdickinson(a)enthought.com> date: Sat Sep 24 08:56:09 2011 +0100 summary: Issue #12973: Fix itertools bug caused by signed integer overflow. Thanks Stefan Krah. files: Misc/NEWS | 6 +++--- Modules/itertoolsmodule.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/… [View More]

1 0

cpython (merge 3.2 -> default): Merge #12973 itertools fix.
by mark.dickinson Sept. 24, 2011

Sept. 24, 2011

http://hg.python.org/cpython/rev/18eec56bcf29 changeset: 72460:18eec56bcf29 parent: 72458:493886a640b6 parent: 72459:b378864d8ff3 user: Mark Dickinson <mdickinson(a)enthought.com> date: Sat Sep 24 08:57:00 2011 +0100 summary: Merge #12973 itertools fix. files: Misc/NEWS | 6 +++--- Modules/itertoolsmodule.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -… [View More]

1 0

Daily reference leaks (493886a640b6): sum=0
by solipsis＠pitrou.net Sept. 24, 2011

Sept. 24, 2011

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

1 0