Mailman 3 September 2009 - Python-checkins

r75142 - in python/branches/release31-maint: Lib/http/client.py Lib/test/test_httplib.py Misc/ACKS
by antoine.pitrou 29 Sep '09

29 Sep '09

Author: antoine.pitrou Date: Tue Sep 29 21:02:24 2009 New Revision: 75142 Log: Merged revisions 75137 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75137 | antoine.pitrou | 2009-09-29 20:44:53 +0200 (mar., 29 sept. 2009) | 14 lines [NOTE: the original bug doesn't exist in py3k but this adds Kirk's tests and fixes another bug in the process] Merged revisions 75134 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75134 | antoine.pitrou | 2009-09-29 19:48:18 +0200 (mar., 29 sept. 2009) | 4 lines Issue #6790: Make it possible again to pass an `array.array` to `httplib.HTTPConnection.send`. Patch by Kirk McDonald. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/http/client.py python/branches/release31-maint/Lib/test/test_httplib.py python/branches/release31-maint/Misc/ACKS Modified: python/branches/release31-maint/Lib/http/client.py ============================================================================== --- python/branches/release31-maint/Lib/http/client.py (original) +++ python/branches/release31-maint/Lib/http/client.py Tue Sep 29 21:02:24 2009 @@ -726,10 +726,17 @@ if self.debuglevel > 0: print("sendIng a read()able") encode = False - if "b" not in str.mode: - encode = True - if self.debuglevel > 0: - print("encoding file using iso-8859-1") + try: + mode = str.mode + except AttributeError: + # io.BytesIO and other file-like objects don't have a `mode` + # attribute. + pass + else: + if "b" not in mode: + encode = True + if self.debuglevel > 0: + print("encoding file using iso-8859-1") while 1: data = str.read(blocksize) if not data: Modified: python/branches/release31-maint/Lib/test/test_httplib.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_httplib.py (original) +++ python/branches/release31-maint/Lib/test/test_httplib.py Tue Sep 29 21:02:24 2009 @@ -1,6 +1,7 @@ import errno from http import client import io +import array import socket from unittest import TestCase @@ -174,6 +175,20 @@ self.assertTrue(sock.data.startswith(expected), '%r != %r' % (sock.data[:len(expected)], expected)) + def test_send(self): + expected = b'this is a test this is only a test' + conn = client.HTTPConnection('example.com') + sock = FakeSocket(None) + conn.sock = sock + conn.send(expected) + self.assertEquals(expected, sock.data) + sock.data = b'' + conn.send(array.array('b', expected)) + self.assertEquals(expected, sock.data) + sock.data = b'' + conn.send(io.BytesIO(expected)) + self.assertEquals(expected, sock.data) + def test_chunked(self): chunked_start = ( 'HTTP/1.1 200 OK\r\n' Modified: python/branches/release31-maint/Misc/ACKS ============================================================================== --- python/branches/release31-maint/Misc/ACKS (original) +++ python/branches/release31-maint/Misc/ACKS Tue Sep 29 21:02:24 2009 @@ -477,6 +477,7 @@ Graham Matthews Dieter Maurer Arnaud Mazin +Kirk McDonald Chris McDonough Greg McFarlane Alan McIntyre

1 0

r75141 - in python/trunk: Lib/test/test_marshal.py Misc/NEWS Python/marshal.c
by mark.dickinson 29 Sep '09

29 Sep '09

Author: mark.dickinson Date: Tue Sep 29 21:01:06 2009 New Revision: 75141 Log: Issue #7019: Unmarshalling of bad long data could produce unnormalized PyLongs. Raise ValueError instead. Modified: python/trunk/Lib/test/test_marshal.py python/trunk/Misc/NEWS python/trunk/Python/marshal.c Modified: python/trunk/Lib/test/test_marshal.py ============================================================================== --- python/trunk/Lib/test/test_marshal.py (original) +++ python/trunk/Lib/test/test_marshal.py Tue Sep 29 21:01:06 2009 @@ -262,6 +262,11 @@ testString = 'abc' * size marshal.dumps(testString) + def test_invalid_longs(self): + # Issue #7019: marshal.loads shouldn't produce unnormalized PyLongs + invalid_string = 'l\x02\x00\x00\x00\x00\x00\x00\x00' + self.assertRaises(ValueError, marshal.loads, invalid_string) + def test_main(): test_support.run_unittest(IntTestCase, Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Tue Sep 29 21:01:06 2009 @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #7019: Raise ValueError when unmarshalling bad long data, instead + of producing internally inconsistent Python longs. + - Issue #6990: Fix threading.local subclasses leaving old state around after a reference cycle GC which could be recycled by new locals. Modified: python/trunk/Python/marshal.c ============================================================================== --- python/trunk/Python/marshal.c (original) +++ python/trunk/Python/marshal.c Tue Sep 29 21:01:06 2009 @@ -556,7 +556,7 @@ r_PyLong(RFILE *p) { PyLongObject *ob; - int size, i, j, md; + int size, i, j, md, shorts_in_top_digit; long n; digit d; @@ -569,7 +569,8 @@ return NULL; } - size = 1 + (ABS(n)-1) / PyLong_MARSHAL_RATIO; + size = 1 + (ABS(n) - 1) / PyLong_MARSHAL_RATIO; + shorts_in_top_digit = 1 + (ABS(n) - 1) % PyLong_MARSHAL_RATIO; ob = _PyLong_New(size); if (ob == NULL) return NULL; @@ -586,12 +587,21 @@ ob->ob_digit[i] = d; } d = 0; - for (j=0; j < (ABS(n)-1)%PyLong_MARSHAL_RATIO + 1; j++) { + for (j=0; j < shorts_in_top_digit; j++) { md = r_short(p); if (md < 0 || md > PyLong_MARSHAL_BASE) goto bad_digit; + /* topmost marshal digit should be nonzero */ + if (md == 0 && j == shorts_in_top_digit - 1) { + Py_DECREF(ob); + PyErr_SetString(PyExc_ValueError, + "bad marshal data (unnormalized long data)"); + return NULL; + } d += (digit)md << j*PyLong_MARSHAL_SHIFT; } + /* top digit should be nonzero, else the resulting PyLong won't be + normalized */ ob->ob_digit[size-1] = d; return (PyObject *)ob; bad_digit:

1 0

r75140 - python/branches/release31-maint/Doc/library/stdtypes.rst
by raymond.hettinger 29 Sep '09

29 Sep '09

Author: raymond.hettinger Date: Tue Sep 29 20:56:36 2009 New Revision: 75140 Log: Issue 7008: Better document str.title and show how to work around the apostrophe problem. Modified: python/branches/release31-maint/Doc/library/stdtypes.rst Modified: python/branches/release31-maint/Doc/library/stdtypes.rst ============================================================================== --- python/branches/release31-maint/Doc/library/stdtypes.rst (original) +++ python/branches/release31-maint/Doc/library/stdtypes.rst Tue Sep 29 20:56:36 2009 @@ -1125,8 +1125,28 @@ .. method:: str.title() - Return a titlecased version of the string: words start with uppercase - characters, all remaining cased characters are lowercase. + Return a titlecased version of the string where words start with an uppercase + character and the remaining characters are lowercase. + + The algorithm uses a simple language-independent definition of a word as + groups of consecutive letters. The definition works in many contexts but + it means that apostrophes in contractions and possessives form word + boundaries, which may not be the desired result:: + + >>> "they're bill's friends from the UK".title() + "They'Re Bill'S Friends From The Uk" + + A workaround for apostrophes can be constructed using regular expressions:: + + >>> import re + >>> def titlecase(s): + return re.sub(r"[A-Za-z]+('[A-Za-z]+)?", + lambda mo: mo.group(0)[0].upper() + + mo.group(0)[1:].lower(), + s) + + >>> titlecase("they're bill's friends.") + "They're Bill's Friends." .. method:: str.translate(map)

1 0

r75139 - python/trunk/Doc/library/stdtypes.rst
by raymond.hettinger 29 Sep '09

29 Sep '09

Author: raymond.hettinger Date: Tue Sep 29 20:53:24 2009 New Revision: 75139 Log: Issue 7008: Better document str.title and show how to work around the apostrophe problem. Modified: python/trunk/Doc/library/stdtypes.rst Modified: python/trunk/Doc/library/stdtypes.rst ============================================================================== --- python/trunk/Doc/library/stdtypes.rst (original) +++ python/trunk/Doc/library/stdtypes.rst Tue Sep 29 20:53:24 2009 @@ -1182,8 +1182,28 @@ .. method:: str.title() - Return a titlecased version of the string: words start with uppercase - characters, all remaining cased characters are lowercase. + Return a titlecased version of the string where words start with an uppercase + character and the remaining characters are lowercase. + + The algorithm uses a simple language-independent definition of a word as + groups of consecutive letters. The definition works in many contexts but + it means that apostrophes in contractions and possessives form word + boundaries, which may not be the desired result:: + + >>> "they're bill's friends from the UK".title() + "They'Re Bill'S Friends From The Uk" + + A workaround for apostrophes can be constructed using regular expressions:: + + >>> import re + >>> def titlecase(s): + return re.sub(r"[A-Za-z]+('[A-Za-z]+)?", + lambda mo: mo.group(0)[0].upper() + + mo.group(0)[1:].lower(), + s) + + >>> titlecase("they're bill's friends.") + "They're Bill's Friends." For 8-bit strings, this method is locale-dependent.

1 0

r75138 - python/branches/release26-maint/Doc/library/stdtypes.rst
by raymond.hettinger 29 Sep '09

29 Sep '09

Author: raymond.hettinger Date: Tue Sep 29 20:48:09 2009 New Revision: 75138 Log: Issue 7008: Better document str.title and show how to work around the apostrophe problem. Modified: python/branches/release26-maint/Doc/library/stdtypes.rst Modified: python/branches/release26-maint/Doc/library/stdtypes.rst ============================================================================== --- python/branches/release26-maint/Doc/library/stdtypes.rst (original) +++ python/branches/release26-maint/Doc/library/stdtypes.rst Tue Sep 29 20:48:09 2009 @@ -1131,8 +1131,28 @@ .. method:: str.title() - Return a titlecased version of the string: words start with uppercase - characters, all remaining cased characters are lowercase. + Return a titlecased version of the string where words start with an uppercase + character and the remaining characters are lowercase. + + The algorithm uses a simple language-independent definition of a word as + groups of consecutive letters. The definition works in many contexts but + it means that apostrophes in contractions and possessives form word + boundaries, which may not be the desired result:: + + >>> "they're bill's friends from the UK".title() + "They'Re Bill'S Friends From The Uk" + + A workaround for apostrophes can be constructed using regular expressions:: + + >>> import re + >>> def titlecase(s): + return re.sub(r"[A-Za-z]+('[A-Za-z]+)?", + lambda mo: mo.group(0)[0].upper() + + mo.group(0)[1:].lower(), + s) + + >>> titlecase("they're bill's friends.") + "They're Bill's Friends." For 8-bit strings, this method is locale-dependent.

1 0

r75137 - in python/branches/py3k: Lib/http/client.py Lib/test/test_httplib.py Misc/ACKS
by antoine.pitrou 29 Sep '09

29 Sep '09

Author: antoine.pitrou Date: Tue Sep 29 20:44:53 2009 New Revision: 75137 Log: [NOTE: the original bug doesn't exist in py3k but this adds Kirk's tests and fixes another bug in the process] Merged revisions 75134 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75134 | antoine.pitrou | 2009-09-29 19:48:18 +0200 (mar., 29 sept. 2009) | 4 lines Issue #6790: Make it possible again to pass an `array.array` to `httplib.HTTPConnection.send`. Patch by Kirk McDonald. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/http/client.py python/branches/py3k/Lib/test/test_httplib.py python/branches/py3k/Misc/ACKS Modified: python/branches/py3k/Lib/http/client.py ============================================================================== --- python/branches/py3k/Lib/http/client.py (original) +++ python/branches/py3k/Lib/http/client.py Tue Sep 29 20:44:53 2009 @@ -726,10 +726,17 @@ if self.debuglevel > 0: print("sendIng a read()able") encode = False - if "b" not in str.mode: - encode = True - if self.debuglevel > 0: - print("encoding file using iso-8859-1") + try: + mode = str.mode + except AttributeError: + # io.BytesIO and other file-like objects don't have a `mode` + # attribute. + pass + else: + if "b" not in mode: + encode = True + if self.debuglevel > 0: + print("encoding file using iso-8859-1") while 1: data = str.read(blocksize) if not data: Modified: python/branches/py3k/Lib/test/test_httplib.py ============================================================================== --- python/branches/py3k/Lib/test/test_httplib.py (original) +++ python/branches/py3k/Lib/test/test_httplib.py Tue Sep 29 20:44:53 2009 @@ -1,6 +1,7 @@ import errno from http import client import io +import array import socket from unittest import TestCase @@ -174,6 +175,20 @@ self.assertTrue(sock.data.startswith(expected), '%r != %r' % (sock.data[:len(expected)], expected)) + def test_send(self): + expected = b'this is a test this is only a test' + conn = client.HTTPConnection('example.com') + sock = FakeSocket(None) + conn.sock = sock + conn.send(expected) + self.assertEquals(expected, sock.data) + sock.data = b'' + conn.send(array.array('b', expected)) + self.assertEquals(expected, sock.data) + sock.data = b'' + conn.send(io.BytesIO(expected)) + self.assertEquals(expected, sock.data) + def test_chunked(self): chunked_start = ( 'HTTP/1.1 200 OK\r\n' Modified: python/branches/py3k/Misc/ACKS ============================================================================== --- python/branches/py3k/Misc/ACKS (original) +++ python/branches/py3k/Misc/ACKS Tue Sep 29 20:44:53 2009 @@ -481,6 +481,7 @@ Graham Matthews Dieter Maurer Arnaud Mazin +Kirk McDonald Chris McDonough Greg McFarlane Alan McIntyre

1 0

r75136 - python/branches/release26-maint
by mark.dickinson 29 Sep '09

29 Sep '09

Author: mark.dickinson Date: Tue Sep 29 20:19:26 2009 New Revision: 75136 Log: Recorded merge of revisions 75129 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75129 | vinay.sajip | 2009-09-29 08:08:54 +0100 (Tue, 29 Sep 2009) | 1 line Issue #7014: logging: Improved IronPython 2.6 compatibility. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r75135 - in python/branches/release26-maint: Lib/httplib.py Lib/test/test_httplib.py Misc/ACKS Misc/NEWS
by antoine.pitrou 29 Sep '09

29 Sep '09

Author: antoine.pitrou Date: Tue Sep 29 20:14:09 2009 New Revision: 75135 Log: Merged revisions 75134 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75134 | antoine.pitrou | 2009-09-29 19:48:18 +0200 (mar., 29 sept. 2009) | 4 lines Issue #6790: Make it possible again to pass an `array.array` to `httplib.HTTPConnection.send`. Patch by Kirk McDonald. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/httplib.py python/branches/release26-maint/Lib/test/test_httplib.py python/branches/release26-maint/Misc/ACKS python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/httplib.py ============================================================================== --- python/branches/release26-maint/Lib/httplib.py (original) +++ python/branches/release26-maint/Lib/httplib.py Tue Sep 29 20:14:09 2009 @@ -66,6 +66,7 @@ Req-sent-unread-response _CS_REQ_SENT <response_class> """ +from array import array import socket from sys import py3kwarning from urlparse import urlsplit @@ -732,7 +733,7 @@ print "send:", repr(str) try: blocksize=8192 - if hasattr(str,'read') : + if hasattr(str,'read') and not isinstance(str, array): if self.debuglevel > 0: print "sendIng a read()able" data=str.read(blocksize) while data: Modified: python/branches/release26-maint/Lib/test/test_httplib.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_httplib.py (original) +++ python/branches/release26-maint/Lib/test/test_httplib.py Tue Sep 29 20:14:09 2009 @@ -1,3 +1,4 @@ +import array import httplib import StringIO import socket @@ -15,7 +16,7 @@ self.data = '' def sendall(self, data): - self.data += data + self.data += ''.join(data) def makefile(self, mode, bufsize=None): if mode != 'r' and mode != 'rb': @@ -162,6 +163,20 @@ conn.request('GET', '/foo', body) self.assertTrue(sock.data.startswith(expected)) + def test_send(self): + expected = 'this is a test this is only a test' + conn = httplib.HTTPConnection('example.com') + sock = FakeSocket(None) + conn.sock = sock + conn.send(expected) + self.assertEquals(expected, sock.data) + sock.data = '' + conn.send(array.array('c', expected)) + self.assertEquals(expected, sock.data) + sock.data = '' + conn.send(StringIO.StringIO(expected)) + self.assertEquals(expected, sock.data) + def test_chunked(self): chunked_start = ( 'HTTP/1.1 200 OK\r\n' Modified: python/branches/release26-maint/Misc/ACKS ============================================================================== --- python/branches/release26-maint/Misc/ACKS (original) +++ python/branches/release26-maint/Misc/ACKS Tue Sep 29 20:14:09 2009 @@ -458,6 +458,7 @@ Graham Matthews Dieter Maurer Arnaud Mazin +Kirk McDonald Chris McDonough Greg McFarlane Alan McIntyre Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Tue Sep 29 20:14:09 2009 @@ -85,6 +85,9 @@ Library ------- +- Issue #6790: Make it possible again to pass an `array.array` to + `httplib.HTTPConnection.send`. Patch by Kirk McDonald. + - Issue #6236, #6348: Fix various failures in the `io` module under AIX and other platforms, when using a non-gcc compiler. Patch by egreen.

1 0

r75134 - in python/trunk: Lib/httplib.py Lib/test/test_httplib.py Misc/ACKS Misc/NEWS
by antoine.pitrou 29 Sep '09

29 Sep '09

Author: antoine.pitrou Date: Tue Sep 29 19:48:18 2009 New Revision: 75134 Log: Issue #6790: Make it possible again to pass an `array.array` to `httplib.HTTPConnection.send`. Patch by Kirk McDonald. Modified: python/trunk/Lib/httplib.py python/trunk/Lib/test/test_httplib.py python/trunk/Misc/ACKS python/trunk/Misc/NEWS Modified: python/trunk/Lib/httplib.py ============================================================================== --- python/trunk/Lib/httplib.py (original) +++ python/trunk/Lib/httplib.py Tue Sep 29 19:48:18 2009 @@ -66,6 +66,7 @@ Req-sent-unread-response _CS_REQ_SENT <response_class> """ +from array import array import socket from sys import py3kwarning from urlparse import urlsplit @@ -747,7 +748,7 @@ print "send:", repr(str) try: blocksize=8192 - if hasattr(str,'read') : + if hasattr(str,'read') and not isinstance(str, array): if self.debuglevel > 0: print "sendIng a read()able" data=str.read(blocksize) while data: Modified: python/trunk/Lib/test/test_httplib.py ============================================================================== --- python/trunk/Lib/test/test_httplib.py (original) +++ python/trunk/Lib/test/test_httplib.py Tue Sep 29 19:48:18 2009 @@ -1,3 +1,4 @@ +import array import httplib import StringIO import socket @@ -15,7 +16,7 @@ self.data = '' def sendall(self, data): - self.data += data + self.data += ''.join(data) def makefile(self, mode, bufsize=None): if mode != 'r' and mode != 'rb': @@ -162,6 +163,20 @@ conn.request('GET', '/foo', body) self.assertTrue(sock.data.startswith(expected)) + def test_send(self): + expected = 'this is a test this is only a test' + conn = httplib.HTTPConnection('example.com') + sock = FakeSocket(None) + conn.sock = sock + conn.send(expected) + self.assertEquals(expected, sock.data) + sock.data = '' + conn.send(array.array('c', expected)) + self.assertEquals(expected, sock.data) + sock.data = '' + conn.send(StringIO.StringIO(expected)) + self.assertEquals(expected, sock.data) + def test_chunked(self): chunked_start = ( 'HTTP/1.1 200 OK\r\n' Modified: python/trunk/Misc/ACKS ============================================================================== --- python/trunk/Misc/ACKS (original) +++ python/trunk/Misc/ACKS Tue Sep 29 19:48:18 2009 @@ -477,6 +477,7 @@ Graham Matthews Dieter Maurer Arnaud Mazin +Kirk McDonald Chris McDonough Greg McFarlane Alan McIntyre Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Tue Sep 29 19:48:18 2009 @@ -383,6 +383,9 @@ Library ------- +- Issue #6790: Make it possible again to pass an `array.array` to + `httplib.HTTPConnection.send`. Patch by Kirk McDonald. + - Issue #6236, #6348: Fix various failures in the `io` module under AIX and other platforms, when using a non-gcc compiler. Patch by egreen.

1 0

Re: [Python-checkins] r75131 - in python/trunk: Mac/README configure configure.in
by Jim Jewett 29 Sep '09

29 Sep '09

On Tue, Sep 29, 2009 at 9:00 AM, ronald.oussoren <python-checkins(a)python.org> wrote: > Author: ronald.oussoren > Date: Tue Sep 29 15:00:44 2009 > New Revision: 75131 > Modified: python/trunk/Mac/README ... > +* ``--enable-universalsdk[=PATH]`` > + > + Create a universal binary build of of Python. This can be used with both > + regular and framework builds. > + > + The optional argument specifies with OSX SDK should be used to perform the I think that should be ... specifies *which* OSX SDK ... ... "flavor" vs "flavour" -- not sure if it is worth changing, since you are at consistent within this area. ... > +To build a universal binary that includes a 64-bit architecture you must build > +on a system running OSX 10.5 or later. The ``all`` flavour can only be build on > +OSX 10.5. > + To build a universal binary that includes a 64-bit architecture, you must build on a system running OSX 10.5 or later. The ``all`` flavour can only be built on OSX 10.5. (added a comma, changed "build" into "built" in "can only be build") Not sure why this next part was deleted, but if it was intentional, I'll trust you. > @@ -101,14 +164,6 @@ > which you would want in $HOME/bin, but there is no easy way to fix this right > now. > > -If you want to install some part, but not all, read the main Makefile. The > -frameworkinstall is composed of a couple of sub-targets that install the > -framework itself, the Mac subtree, the applications and the unix tools. > - > -There is an extra target frameworkinstallextras that is not part of the > -normal frameworkinstall which installs the Demo and Tools directories > -into "/Applications/MacPython 2.6", this is useful for binary distributions. > - > What do all these programs do? > =============================== >

1 0