Mailman 3 April 2005 - Python-checkins

python/dist/src/Misc developers.txt,1.10,1.11
by rhettinger＠users.sourceforge.net April 30, 2005

April 30, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5865 Modified Files: developers.txt Log Message: Update Paul Prescod's permissions. Index: developers.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/developers.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- developers.txt 13 Apr 2005 22:04:21 -0000 1.10 +++ developers.txt 30 Apr 2005 21:25:19 -0000 1.11 @@ -37,6 +37,8 @@ Permissions Dropped on Request ------------------------------ +- Paul Prescod sent a drop request. 30 Apr 2005 RDH + - Finn Bock sent a drop request. 13 Apr 2005 RDH - Eric Price sent a drop request. 10 Apr 2005 RDH

1 0

python/dist/src/Lib random.py,1.70,1.71
by rhettinger＠users.sourceforge.net April 30, 2005

April 30, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15004 Modified Files: random.py Log Message: SF patch #1191489: Simplify logic in random.py Index: random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- random.py 3 Jan 2005 07:33:16 -0000 1.70 +++ random.py 30 Apr 2005 09:02:51 -0000 1.71 @@ -345,7 +345,7 @@ # Math Software, 3, (1977), pp257-260. random = self.random - while True: + while 1: u1 = random() u2 = 1.0 - random() z = NV_MAGICCONST*(u1-0.5)/u2 @@ -415,7 +415,7 @@ b = (a - _sqrt(2.0 * a))/(2.0 * kappa) r = (1.0 + b * b)/(2.0 * b) - while True: + while 1: u1 = random() z = _cos(_pi * u1) @@ -424,7 +424,7 @@ u2 = random() - if not (u2 >= c * (2.0 - c) and u2 > c * _exp(1.0 - c)): + if u2 < c * (2.0 - c) or u2 <= c * _exp(1.0 - c): break u3 = random() @@ -462,7 +462,7 @@ bbb = alpha - LOG4 ccc = alpha + ainv - while True: + while 1: u1 = random() if not 1e-7 < u1 < .9999999: continue @@ -485,18 +485,19 @@ # Uses ALGORITHM GS of Statistical Computing - Kennedy & Gentle - while True: + while 1: u = random() b = (_e + alpha)/_e p = b*u if p <= 1.0: - x = pow(p, 1.0/alpha) + x = p ** (1.0/alpha) else: - # p > 1 x = -_log((b-p)/alpha) u1 = random() - if not (((p <= 1.0) and (u1 > _exp(-x))) or - ((p > 1) and (u1 > pow(x, alpha - 1.0)))): + if p > 1.0: + if u1 <= x ** (alpha - 1.0): + break + elif u1 <= _exp(-x): break return x * beta

1 0

python/dist/src/Lib/test test_binop.py, 1.7, 1.7.20.1
by bcannon＠users.sourceforge.net April 30, 2005

April 30, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20701/Lib/test Modified Files: Tag: release24-maint test_binop.py Log Message: Fix a docstring with mismatched opening and closing quotes. Backport of fix for bug #1192777. Index: test_binop.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_binop.py,v retrieving revision 1.7 retrieving revision 1.7.20.1 diff -u -d -r1.7 -r1.7.20.1 --- test_binop.py 23 Jul 2002 19:03:45 -0000 1.7 +++ test_binop.py 30 Apr 2005 05:51:59 -0000 1.7.20.1 @@ -178,7 +178,7 @@ return (x, self - other * x) def __rdivmod__(self, other): - "Divide two Rats, returning quotient and remainder (reversed args).""" + """Divide two Rats, returning quotient and remainder (reversed args).""" if isint(other): other = Rat(other) elif not isRat(other):

1 0

python/dist/src/Lib/test test_binop.py,1.7,1.8
by bcannon＠users.sourceforge.net April 30, 2005

April 30, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19751/Lib/test Modified Files: test_binop.py Log Message: Fix error in a docstring where a single quote started the docstring but triple quote ended it. Closes bug #1192777. Thanks Christopher Smith. Index: test_binop.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_binop.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- test_binop.py 23 Jul 2002 19:03:45 -0000 1.7 +++ test_binop.py 30 Apr 2005 05:50:19 -0000 1.8 @@ -178,7 +178,7 @@ return (x, self - other * x) def __rdivmod__(self, other): - "Divide two Rats, returning quotient and remainder (reversed args).""" + """Divide two Rats, returning quotient and remainder (reversed args).""" if isint(other): other = Rat(other) elif not isRat(other):

1 0

python/dist/src/Lib SocketServer.py,1.38,1.39
by gvanrossum＠users.sourceforge.net April 30, 2005

April 30, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15954 Modified Files: SocketServer.py Log Message: Fixed a typo in docstring I happened upon. Index: SocketServer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/SocketServer.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- SocketServer.py 31 Dec 2004 19:15:26 -0000 1.38 +++ SocketServer.py 30 Apr 2005 00:20:35 -0000 1.39 @@ -50,7 +50,7 @@ unix server classes. Forking and threading versions of each type of server can be created -using the ForkingServer and ThreadingServer mix-in classes. For +using the ForkingMixIn and ThreadingMixIn mix-in classes. For instance, a threading UDP server class is created as follows: class ThreadingUDPServer(ThreadingMixIn, UDPServer): pass

1 0

python/nondist/peps pep-0340.txt,1.11,1.12
by gvanrossum＠users.sourceforge.net April 29, 2005

April 29, 2005

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26665 Modified Files: pep-0340.txt Log Message: Add a section of loose ends. Index: pep-0340.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0340.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- pep-0340.txt 29 Apr 2005 17:13:08 -0000 1.11 +++ pep-0340.txt 29 Apr 2005 18:51:03 -0000 1.12 @@ -36,19 +36,19 @@ The added twist is that instead of adding a flag argument to next() and __next__() to indicate whether the previous argument is - a value or an exception, we use a separate API (an __error__() + a value or an exception, we use a separate API (an __exit__() method taking an exception and perhaps a traceback) for the - exception. If an iterator doesn't implement __error__(), the + exception. If an iterator doesn't implement __exit__(), the exception is just re-raised. It is expected that, apart from - generators, very few iterators will implement __error__(); one use + generators, very few iterators will implement __exit__(); one use case would be a fast implementation of synchronized() written in C. The built-in next() function only interfaces to the next() and __next__() methods; there is no user-friendly API to call - __error__(). - - Perhaps __error__() should be named __exit__(). + __exit__(). (Or perhaps calling next(itr, exc, traceback) would + call itr.__exit__(exc, traceback) if itr has an __exit__ method + and otherwise raise exc.__class__, exc, traceback?) Motivation and Summary @@ -432,6 +432,32 @@ EXPR2" is changed; break and return translate to themselves in that case). +Loose Ends + + These are things that need to be resolved before accepting the + PEP. + + - Fill in the remaining TBD sections. + + - Address Phillip Eby's proposal to have the block-statement use + an entirely different API than the for-loop, to differentiate + between the two (a generator would have to be wrapped in a + decorator to make it support the block API). + + - Decide on the keyword ('block', 'with', '@', nothing, or + something else?). + + - Phillip Eby wants a way to pass tracebacks along with + exceptions. + + - The translation for the for-loop's else-clause. + + - Whether a block-statement should allow an else-clause. + + - Which API to use to pass in an exception: itr.__next__(exc), + itr.__next__(exc, True) or itr.__exit__(exc[, traceback]). + Hmm..., perhaps itr.__next__(exc, traceback)? + Comparison to Thunks Alternative semantics proposed for the block-statement turn the

1 0

python/nondist/peps pep-0340.txt,1.10,1.11
by gvanrossum＠users.sourceforge.net April 29, 2005

April 29, 2005

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31649 Modified Files: pep-0340.txt Log Message: Mention else-clauses; the else-clause on the translation of the for-loop was broken, and the break-statement probabyl shouldn't have one. Index: pep-0340.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0340.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- pep-0340.txt 29 Apr 2005 15:23:34 -0000 1.10 +++ pep-0340.txt 29 Apr 2005 17:13:08 -0000 1.11 @@ -150,8 +150,6 @@ for VAR1 in EXPR1: BLOCK1 - else: - BLOCK2 will be translated as follows: @@ -164,14 +162,16 @@ break arg = None BLOCK1 - else: - BLOCK2 (However, 'itr' and 'arg' are hidden from the user, their scope ends when the while-loop is exited, and they are not shared with nested or outer for-loops, and the user cannot override the built-ins referenced.) + I'm leaving the translation of an else-clause up to the reader; + note that you can't simply affix the else-clause to the while-loop + since it is always broken out. + Specification: the Extended 'continue' Statement In the translation of the for-loop, inside BLOCK1, the new syntax @@ -286,6 +286,12 @@ the limitations of all finalization semantics) that the block will be resumed eventually. + I haven't decided yet whether the block-statement should also + allow an optional else-clause, like the for-loop. I think it + would be confusing, and emphasize the "loopiness" of the + block-statement, while I want to emphasize its *difference* from a + for-loop. + Specification: Generator Exception Handling Generators will implement the new __next__() method API, as well @@ -618,9 +624,9 @@ Lundh, Greg Ewing, Holger Krekel, Jason Diamond, Jim Jewett, Josiah Carlson, Ka-Ping Yee, Michael Chermside, Michael Hudson, Neil Schemenauer, Nick Coghlan, Paul Moore, Phillip Eby, Raymond - Hettinger, Samuele Pedroni, Shannon Behrens, Steven Bethard, Terry - Reedy, Tim Delaney, Aahz, and others. Thanks all for the valuable - discussion and ideas! + Hettinger, Samuele Pedroni, Shannon Behrens, Skip Montanaro, + Steven Bethard, Terry Reedy, Tim Delaney, Aahz, and others. + Thanks all for the valuable contributions! References

1 0

python/nondist/peps pep-0340.txt,1.9,1.10
by montanaro＠users.sourceforge.net April 29, 2005

April 29, 2005

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4754 Modified Files: pep-0340.txt Log Message: typos Index: pep-0340.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0340.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pep-0340.txt 29 Apr 2005 14:44:31 -0000 1.9 +++ pep-0340.txt 29 Apr 2005 15:23:34 -0000 1.10 @@ -277,7 +277,7 @@ Note that a yield-statement (or a yield-expression, see below) in a block-statement is not treated differently. It suspends the function containing the block *without* notifying the block's - iterator. The blocks's iterator is entirely unaware of this + iterator. The block's iterator is entirely unaware of this yield, since the local control flow doesn't actually leave the block. In other words, it is *not* like a break, continue or return statement. When the loop that was resumed by the yield @@ -351,7 +351,7 @@ garbage-collected. This is no different than the guarantees that are made about finalizers (__del__() methods) of other objects. - Note: the syntactic extensions to yield make it use very similar + Note: the syntactic extensions to yield make its use very similar to that in Ruby. This is intentional. Do note that in Python the block passes a value to the generator using "continue EXPR" rather than "return EXPR", and the underlying mechanism whereby control

1 0

python/nondist/peps pep-0340.txt,1.8,1.9
by montanaro＠users.sourceforge.net April 29, 2005

April 29, 2005

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16592 Modified Files: pep-0340.txt Log Message: typo Index: pep-0340.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0340.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- pep-0340.txt 29 Apr 2005 05:12:38 -0000 1.8 +++ pep-0340.txt 29 Apr 2005 14:44:31 -0000 1.9 @@ -167,7 +167,7 @@ else: BLOCK2 - (However, 'it' and 'arg' are hidden from the user, their scope + (However, 'itr' and 'arg' are hidden from the user, their scope ends when the while-loop is exited, and they are not shared with nested or outer for-loops, and the user cannot override the built-ins referenced.)

1 0

python/dist/src/Lib/email/test test_email.py, 1.50.10.6, 1.50.10.7
by bwarsaw＠users.sourceforge.net April 29, 2005

April 29, 2005

Update of /cvsroot/python/python/dist/src/Lib/email/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31703/test Modified Files: Tag: release23-maint test_email.py Log Message: get_filename(), get_content_charset(): It's possible that the charset named in an RFC 2231-style header could be bogus or unknown to Python. In that case, we return the the text part of the parameter undecoded. However, in get_content_charset(), if that is not ascii, then it is an illegal charset and so we return failobj. Test cases and a version bump are included. Committing this to the Python 2.3 branch because I need to generate an email 2.5.6 release that contains these patches. I will port these fixes to Python 2.4 and 2.5 for email 3.x. Index: test_email.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/email/test/test_email.py,v retrieving revision 1.50.10.6 retrieving revision 1.50.10.7 diff -u -d -r1.50.10.6 -r1.50.10.7 --- test_email.py 6 Nov 2004 00:13:46 -0000 1.50.10.6 +++ test_email.py 29 Apr 2005 12:12:02 -0000 1.50.10.7 @@ -1,4 +1,4 @@ -# Copyright (C) 2001,2002,2003 Python Software Foundation +# Copyright (C) 2001-2005 Python Software Foundation # email package unit tests import os @@ -2758,6 +2758,50 @@ self.assertEqual(msg.get_content_charset(), 'this is even more ***fun*** is it not.pdf') + def test_rfc2231_bad_encoding_in_filename(self): + m = '''\ +Content-Disposition: inline; +\tfilename*0="bogus'xx'This%20is%20even%20more%20"; +\tfilename*1="%2A%2A%2Afun%2A%2A%2A%20"; +\tfilename*2="is it not.pdf" + +''' + msg = email.message_from_string(m) + self.assertEqual(msg.get_filename(), + 'This is even more ***fun*** is it not.pdf') + + def test_rfc2231_bad_encoding_in_charset(self): + m = """\ +Content-Type: text/plain; charset*=bogus''utf-8%E2%80%9D + +""" + msg = email.message_from_string(m) + # This should return None because non-ascii characters in the charset + # are not allowed. + self.assertEqual(msg.get_content_charset(), None) + + def test_rfc2231_bad_character_in_charset(self): + m = """\ +Content-Type: text/plain; charset*=ascii''utf-8%E2%80%9D + +""" + msg = email.message_from_string(m) + # This should return None because non-ascii characters in the charset + # are not allowed. + self.assertEqual(msg.get_content_charset(), None) + + def test_rfc2231_bad_character_in_filename(self): + m = '''\ +Content-Disposition: inline; +\tfilename*0="ascii'xx'This%20is%20even%20more%20"; +\tfilename*1="%2A%2A%2Afun%2A%2A%2A%20"; +\tfilename*2="is it not.pdf%E2" + +''' + msg = email.message_from_string(m) + self.assertEqual(msg.get_filename(), + 'This is even more ***fun*** is it not.pdf\xe2') + def _testclasses():

1 0