Mailman 3 March 2011 - Python-checkins

hooks: Fix signature and append a final linefeed
by antoine.pitrou 01 Mar '11

01 Mar '11

antoine.pitrou pushed 03f2097b90f2 to hooks: http://hg.python.org/hooks/rev/03f2097b90f2 changeset: 36:03f2097b90f2 tag: tip user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Mar 01 02:58:01 2011 +0100 summary: Fix signature and append a final linefeed files: mail.py diff --git a/mail.py b/mail.py --- a/mail.py +++ b/mail.py @@ -42,7 +42,7 @@ differ = patch.diff(repo, node1, node2, opts=diffopts) body.append(''.join(chunk for chunk in differ)) - body.append('--') + body.append('-- ') body.append('Repository URL: %s%s' % (BASE, path)) to = ui.config('mail', 'notify', None) @@ -66,6 +66,6 @@ if len(parents) > 1: subj = "merge in " + subj - send(subj, FROM % user, to, '\n'.join(body)) + send(subj, FROM % user, to, '\n'.join(body) + '\n') print 'notified %s of incoming changeset %s' % (to, ctx) return False -- Repository URL: http://hg.python.org/hooks

1 0

r88691 - python/branches/py3k/Lib/test/test_telnetlib.py
by antoine.pitrou 01 Mar '11

01 Mar '11

Author: antoine.pitrou Date: Tue Mar 1 01:41:10 2011 New Revision: 88691 Log: Endly, fix UnboundLocalError in telnetlib Modified: python/branches/py3k/Lib/test/test_telnetlib.py Modified: python/branches/py3k/Lib/test/test_telnetlib.py ============================================================================== --- python/branches/py3k/Lib/test/test_telnetlib.py (original) +++ python/branches/py3k/Lib/test/test_telnetlib.py Tue Mar 1 01:41:10 2011 @@ -17,9 +17,10 @@ conn, addr = serv.accept() except socket.timeout: pass + else: + conn.close() finally: serv.close() - conn.close() evt.set() class GeneralTests(TestCase):

2 1

r88693 - in python/branches/release27-maint: Lib/test/test_telnetlib.py
by antoine.pitrou 01 Mar '11

01 Mar '11

Author: antoine.pitrou Date: Tue Mar 1 01:48:40 2011 New Revision: 88693 Log: Merged revisions 88691 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88691 | antoine.pitrou | 2011-03-01 01:41:10 +0100 (mar., 01 mars 2011) | 3 lines Endly, fix UnboundLocalError in telnetlib ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Lib/test/test_telnetlib.py Modified: python/branches/release27-maint/Lib/test/test_telnetlib.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_telnetlib.py (original) +++ python/branches/release27-maint/Lib/test/test_telnetlib.py Tue Mar 1 01:48:40 2011 @@ -36,9 +36,10 @@ data = data[written:] except socket.timeout: pass + else: + conn.close() finally: serv.close() - conn.close() evt.set() class GeneralTests(TestCase):

1 0

r88692 - in python/branches/release32-maint: Lib/test/test_telnetlib.py
by antoine.pitrou 01 Mar '11

01 Mar '11

Author: antoine.pitrou Date: Tue Mar 1 01:45:22 2011 New Revision: 88692 Log: Merged revisions 88691 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88691 | antoine.pitrou | 2011-03-01 01:41:10 +0100 (mar., 01 mars 2011) | 3 lines Endly, fix UnboundLocalError in telnetlib ........ Modified: python/branches/release32-maint/ (props changed) python/branches/release32-maint/Lib/test/test_telnetlib.py Modified: python/branches/release32-maint/Lib/test/test_telnetlib.py ============================================================================== --- python/branches/release32-maint/Lib/test/test_telnetlib.py (original) +++ python/branches/release32-maint/Lib/test/test_telnetlib.py Tue Mar 1 01:45:22 2011 @@ -17,9 +17,10 @@ conn, addr = serv.accept() except socket.timeout: pass + else: + conn.close() finally: serv.close() - conn.close() evt.set() class GeneralTests(TestCase):

1 0

r88690 - python/branches/release31-maint/Lib/test/test_zlib.py
by antoine.pitrou 01 Mar '11

01 Mar '11

Author: antoine.pitrou Date: Tue Mar 1 01:29:11 2011 New Revision: 88690 Log: Apparently, skipUnless() doesn't prevent the execution of setUp() under 3.1. Modified: python/branches/release31-maint/Lib/test/test_zlib.py Modified: python/branches/release31-maint/Lib/test/test_zlib.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_zlib.py (original) +++ python/branches/release31-maint/Lib/test/test_zlib.py Tue Mar 1 01:29:11 2011 @@ -66,6 +66,10 @@ # Issue #10276 - check that inputs >=4GB are handled correctly. class ChecksumBigBufferTestCase(unittest.TestCase): + @unittest.skipUnless(mmap, "mmap() is not available.") + @unittest.skipUnless(sys.maxsize > _4G, "Can't run on a 32-bit system.") + @unittest.skipUnless(support.is_resource_enabled("largefile"), + "May use lots of disk space.") def setUp(self): with open(support.TESTFN, "wb+") as f: f.seek(_4G) @@ -77,10 +81,6 @@ self.mapping.close() support.unlink(support.TESTFN) - @unittest.skipUnless(mmap, "mmap() is not available.") - @unittest.skipUnless(sys.maxsize > _4G, "Can't run on a 32-bit system.") - @unittest.skipUnless(support.is_resource_enabled("largefile"), - "May use lots of disk space.") def test_big_buffer(self): self.assertEqual(zlib.crc32(self.mapping), 3058686908) self.assertEqual(zlib.adler32(self.mapping), 82837919)

1 0