Mailman 3 August 2004 - Python-checkins

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.93, 1.94
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12961 Modified Files: whatsnew24.tex Log Message: Change from Raymond: use pos/neg instead of +/- 1; minor edits Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- whatsnew24.tex 31 Aug 2004 12:07:43 -0000 1.93 +++ whatsnew24.tex 31 Aug 2004 12:21:44 -0000 1.94 @@ -439,17 +439,18 @@ FP numbers are made up of three components: \begin{itemize} -\item The sign, which is -1 or +1. +\item The sign, which is positive or negative. \item The mantissa, which is a single-digit binary number followed by a fractional part. For example, \code{1.01} in base-2 notation is \code{1 + 0/2 + 1/4}, or 1.25 in decimal notation. \item The exponent, which tells where the decimal point is located in the number represented. \end{itemize} -For example, the number 1.25 has sign +1, mantissa 1.01 (in binary), -and exponent of 0 (the decimal point doesn't need to be shifted). The -number 5 has the same sign and mantissa, but the exponent is 2 -because the mantissa is multiplied by 4 (2 to the power of the exponent 2). +For example, the number 1.25 has positive sign, a mantissa value of +1.01 (in binary), and an exponent of 0 (the decimal point doesn't need +to be shifted). The number 5 has the same sign and mantissa, but the +exponent is 2 because the mantissa is multiplied by 4 (2 to the power +of the exponent 2). Modern systems usually provide floating-point support that conforms to a relevant standard called IEEE 754. C's \ctype{double} type is @@ -458,11 +459,11 @@ to 52 bits of precision. If you're trying to represent numbers whose expansion repeats endlessly, the expansion is cut off after 52 bits. Unfortunately, most software needs to produce output in base 10, and -base 10 often gives rise to such repeating decimals. For example, 1.1 -decimal is binary \code{1.0001100110011 ...}; .1 = 1/16 + 1/32 + 1/256 -plus an infinite number of additional terms. IEEE 754 has to chop off -that infinitely repeated decimal after 52 digits, so the -representation is slightly inaccurate. +base 10 often gives rise to such repeating decimals in the binary +expansion. For example, 1.1 decimal is binary \code{1.0001100110011 +...}; .1 = 1/16 + 1/32 + 1/256 plus an infinite number of additional +terms. IEEE 754 has to chop off that infinitely repeated decimal +after 52 digits, so the representation is slightly inaccurate. Sometimes you can see this inaccuracy when the number is printed: \begin{verbatim} @@ -471,9 +472,10 @@ \end{verbatim} The inaccuracy isn't always visible when you print the number because -the FP-to-decimal-string conversion is provided by the C library and -most C libraries try to produce sensible output, but the inaccuracy is -still there and subsequent operations can magnify the error. +the FP-to-decimal-string conversion is provided by the C library, and +most C libraries try to produce sensible output. Even if it's not +displayed, however, the inaccuracy is still there and subsequent +operations can magnify the error. For many applications this doesn't matter. If I'm plotting points and displaying them on my monitor, the difference between 1.1 and @@ -483,6 +485,8 @@ never apparent. However, for applications where it does matter, it's a lot of work to implement your own custom arithmetic routines. +Hence, the \class{Decimal} type was created. + \subsection{The \class{Decimal} type} A new module, \module{decimal}, was added to Python's standard library. @@ -490,8 +494,10 @@ \class{Decimal} instances represent numbers, and \class{Context} instances are used to wrap up various settings such as the precision and default rounding mode. -\class{Decimal} instances, like regular Python integers and FP numbers, are immutable; once they've been created, you can't change the value it represents. -\class{Decimal} instances can be created from integers or strings: +\class{Decimal} instances, like regular Python integers and FP +numbers, are immutable; once they've been created, you can't change +the value it represents. \class{Decimal} instances can be created +from integers or strings: \begin{verbatim} >>> import decimal @@ -501,22 +507,24 @@ Decimal("1.1") \end{verbatim} -You can also provide tuples containing the sign, mantissa represented -as a tuple of decimal digits, and exponent: +You can also provide tuples containing the sign, the mantissa represented +as a tuple of decimal digits, and the exponent: \begin{verbatim} >>> decimal.Decimal((1, (1, 4, 7, 5), -2)) Decimal("-14.75") \end{verbatim} -Cautionary note: the sign bit is a Boolean value, so 0 is positive and 1 is negative. +Cautionary note: the sign bit is a Boolean value, so 0 is positive and +1 is negative. -Floating-point numbers posed a bit of a problem: should the FP number -representing 1.1 turn into the decimal number for exactly 1.1, or for -1.1 plus whatever inaccuracies are introduced? The decision was to -leave such a conversion out of the API. Instead, you should convert -the floating-point number into a string using the desired precision and -pass the string to the \class{Decimal} constructor: +Converting from floating-point numbers poses a bit of a problem: +should the FP number representing 1.1 turn into the decimal number for +exactly 1.1, or for 1.1 plus whatever inaccuracies are introduced? +The decision was to leave such a conversion out of the API. Instead, +you should convert the floating-point number into a string using the +desired precision and pass the string to the \class{Decimal} +constructor: \begin{verbatim} >>> f = 1.1

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.92, 1.93
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10008 Modified Files: whatsnew24.tex Log Message: Describe non-recursive re Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- whatsnew24.tex 31 Aug 2004 11:54:22 -0000 1.92 +++ whatsnew24.tex 31 Aug 2004 12:07:43 -0000 1.93 @@ -1184,18 +1184,27 @@ \item The regular expression language accepted by the \module{re} module was extended with simple conditional expressions, written as - \code{(?(\var{group})\var{A}|\var{B})}. \var{group} is either a - numeric group ID or a group name defined with \code{(?P<group>...)} + \regexp{(?(\var{group})\var{A}|\var{B})}. \var{group} is either a + numeric group ID or a group name defined with \regexp{(?P<group>...)} earlier in the expression. If the specified group matched, the regular expression pattern \var{A} will be tested against the string; if the group didn't match, the pattern \var{B} will be used instead. +\item The \module{re} module is also no longer recursive, thanks +to a massive amount of work by Gustavo Niemeyer. In a recursive +regular expression engine, certain patterns result in a large amount +of C stack space being consumed, and it was possible to overflow the +stack. For example, if you matched a 30000-byte string of \samp{a} +characters against the expression \regexp{(a|b)+}, one stack frame was +consumed per character. Python 2.3 tried to check for stack overflow +and raise a \exception{RuntimeError} exception, but if you were +unlucky Python could dump core. Python 2.4's regular expression +engine can match this pattern without problems. + \item A new \function{socketpair()} function was added to the \module{socket} module, returning a pair of connected sockets. (Contributed by Dave Cole.) -% XXX sre is now non-recursive. - \item The \function{sys.exitfunc()} function has been deprecated. Code should be using the existing \module{atexit} module, which correctly handles calling multiple exit functions. Eventually

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.91, 1.92
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6955 Modified Files: whatsnew24.tex Log Message: Add bug/patch counts Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- whatsnew24.tex 31 Aug 2004 11:26:23 -0000 1.91 +++ whatsnew24.tex 31 Aug 2004 11:54:22 -0000 1.92 @@ -1322,9 +1322,10 @@ %====================================================================== \section{Other Changes and Fixes \label{section-other}} +% XXX update these figures as we go As usual, there were a bunch of other improvements and bugfixes scattered throughout the source tree. A search through the CVS change -logs finds there were XXX patches applied and YYY bugs fixed between +logs finds there were 421 patches applied and 413 bugs fixed between Python 2.3 and 2.4. Both figures are likely to be underestimates. Some of the more notable changes are:

1 0

python/dist/src/Lib DocXMLRPCServer.py, 1.3, 1.4 os.py, 1.79, 1.80 _LWPCookieJar.py, 1.1, 1.2 _MozillaCookieJar.py, 1.1, 1.2 urllib2.py, 1.75, 1.76 weakref.py, 1.25, 1.26
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4151 Modified Files: DocXMLRPCServer.py os.py _LWPCookieJar.py _MozillaCookieJar.py urllib2.py weakref.py Log Message: Use multi-line import Index: DocXMLRPCServer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/DocXMLRPCServer.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- DocXMLRPCServer.py 1 May 2003 05:05:08 -0000 1.3 +++ DocXMLRPCServer.py 31 Aug 2004 11:38:11 -0000 1.4 @@ -16,10 +16,10 @@ import re import sys -from SimpleXMLRPCServer import SimpleXMLRPCServer,\ - SimpleXMLRPCRequestHandler,\ - CGIXMLRPCRequestHandler,\ - resolve_dotted_attribute +from SimpleXMLRPCServer import (SimpleXMLRPCServer, + SimpleXMLRPCRequestHandler, + CGIXMLRPCRequestHandler, + resolve_dotted_attribute) class ServerHTMLDoc(pydoc.HTMLDoc): """Class used to generate pydoc HTML document for a server""" Index: os.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- os.py 29 Aug 2004 18:47:31 -0000 1.79 +++ os.py 31 Aug 2004 11:38:12 -0000 1.80 @@ -130,8 +130,8 @@ raise ImportError, 'no os specific module found' sys.modules['os.path'] = path -from os.path import curdir, pardir, sep, pathsep, defpath, extsep, altsep, \ - devnull +from os.path import (curdir, pardir, sep, pathsep, defpath, extsep, altsep, + devnull) del _names Index: _LWPCookieJar.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_LWPCookieJar.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- _LWPCookieJar.py 31 May 2004 18:22:40 -0000 1.1 +++ _LWPCookieJar.py 31 Aug 2004 11:38:12 -0000 1.2 @@ -12,9 +12,9 @@ """ import time, re, logging -from cookielib import reraise_unmasked_exceptions, FileCookieJar, Cookie, \ - MISSING_FILENAME_TEXT, join_header_words, split_header_words, \ - iso2time, time2isoz +from cookielib import (reraise_unmasked_exceptions, FileCookieJar, Cookie, + MISSING_FILENAME_TEXT, join_header_words, split_header_words, + iso2time, time2isoz) def lwp_cookie_str(cookie): """Return string representation of Cookie in an the LWP cookie file format. Index: _MozillaCookieJar.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/_MozillaCookieJar.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- _MozillaCookieJar.py 31 May 2004 18:22:40 -0000 1.1 +++ _MozillaCookieJar.py 31 Aug 2004 11:38:12 -0000 1.2 @@ -2,8 +2,8 @@ import re, time, logging -from cookielib import reraise_unmasked_exceptions, FileCookieJar, Cookie, \ - MISSING_FILENAME_TEXT +from cookielib import (reraise_unmasked_exceptions, FileCookieJar, Cookie, + MISSING_FILENAME_TEXT) class MozillaCookieJar(FileCookieJar): """ Index: urllib2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- urllib2.py 8 Aug 2004 01:05:14 -0000 1.75 +++ urllib2.py 31 Aug 2004 11:38:12 -0000 1.76 @@ -114,9 +114,9 @@ from StringIO import StringIO # not sure how many of these need to be gotten rid of -from urllib import unwrap, unquote, splittype, splithost, \ - addinfourl, splitport, splitgophertype, splitquery, \ - splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue +from urllib import (unwrap, unquote, splittype, splithost, + addinfourl, splitport, splitgophertype, splitquery, + splitattr, ftpwrapper, noheaders, splituser, splitpasswd, splitvalue) # support for FileHandler, proxies via environment variables from urllib import localhost, url2pathname, getproxies Index: weakref.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/weakref.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- weakref.py 19 Aug 2004 21:32:06 -0000 1.25 +++ weakref.py 31 Aug 2004 11:38:12 -0000 1.26 @@ -11,14 +11,14 @@ import UserDict -from _weakref import \ - getweakrefcount, \ - getweakrefs, \ - ref, \ - proxy, \ - CallableProxyType, \ - ProxyType, \ - ReferenceType +from _weakref import ( + getweakrefcount, + getweakrefs, + ref, + proxy, + CallableProxyType, + ProxyType, + ReferenceType) from exceptions import ReferenceError

1 0

python/dist/src/Lib/test test_optparse.py, 1.6, 1.7
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4151/test Modified Files: test_optparse.py Log Message: Use multi-line import Index: test_optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_optparse.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- test_optparse.py 31 Jul 2004 21:17:37 -0000 1.6 +++ test_optparse.py 31 Aug 2004 11:38:12 -0000 1.7 @@ -17,10 +17,10 @@ from pprint import pprint from test import test_support -from optparse import make_option, Option, IndentedHelpFormatter, \ - TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, \ - SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, \ - BadOptionError, OptionValueError, _match_abbrev +from optparse import (make_option, Option, IndentedHelpFormatter, + TitledHelpFormatter, OptionParser, OptionContainer, OptionGroup, + SUPPRESS_HELP, SUPPRESS_USAGE, OptionError, OptionConflictError, + BadOptionError, OptionValueError, _match_abbrev) class BaseTest(unittest.TestCase): def assertParseOK(self, args, expected_opts, expected_positional_args):

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.90, 1.91
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2185 Modified Files: whatsnew24.tex Log Message: Update versions and dates; add PEP 328 Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- whatsnew24.tex 30 Aug 2004 15:03:23 -0000 1.90 +++ whatsnew24.tex 31 Aug 2004 11:26:23 -0000 1.91 @@ -21,15 +21,15 @@ \maketitle \tableofcontents -This article explains the new features in Python 2.4 alpha2, scheduled -for release in late July 2004. The final version of Python 2.4 is -expected to be released around September 2004. +This article explains the new features in Python 2.4 alpha3, scheduled +for release in early September. The final version of Python 2.4 is +expected to be released around December 2004. Python 2.4 is a medium-sized release. It doesn't introduce as many changes as the radical Python 2.2, but introduces more features than the conservative 2.3 release did. The most significant new language -feature (as of this writing) is the addition of generator expressions; -most other changes are to the standard library. +features (as of this writing) are function decorators and generator +expressions; most other changes are to the standard library. This article doesn't attempt to provide a complete specification of every single new feature, but instead provides a convenient overview. @@ -659,6 +659,42 @@ %====================================================================== +\section{PEP 328: Multi-line Imports} + +One language change is a small syntactic tweak aimed at making it +easier to import many names from a module. In a +\code{from \var{module} import \var{names}} statement, +\var{names} is a sequence of names separated by commas. If the sequence is +very long, you can either write multiple imports from the same module, +or you can use backslashes to escape the line endings: + +\begin{verbatim} +from SimpleXMLRPCServer import SimpleXMLRPCServer,\ + SimpleXMLRPCRequestHandler,\ + CGIXMLRPCRequestHandler,\ + resolve_dotted_attribute +\end{verbatim} + +The syntactic change simply allows putting the names within +parentheses. Python ignores newlines within a parenthesized +expression, so the backslashes are no longer needed: + +\begin{verbatim} +from SimpleXMLRPCServer import (SimpleXMLRPCServer, + SimpleXMLRPCRequestHandler, + CGIXMLRPCRequestHandler, + resolve_dotted_attribute) +\end{verbatim} + +The PEP also proposes that all \keyword{import} statements be +absolute imports, with a leading \samp{.} character to indicate a +relative import. This part of the PEP is not yet implemented. + +\begin{seealso} +\seepep{328}{Imports: Multi-Line and Absolute/Relative}{Written by Aahz. Multi-line imports were implemented by Dima Dorfman.} + + +%====================================================================== \section{PEP 331: Locale-Independent Float/String Conversions} The \module{locale} modules lets Python software select various

1 0

python/dist/src/Doc/lib liblogging.tex,1.23,1.24
by vsajip＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23968/lib Modified Files: liblogging.tex Log Message: Updated doc for getLogger() Index: liblogging.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblogging.tex,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- liblogging.tex 4 Aug 2004 08:36:44 -0000 1.23 +++ liblogging.tex 31 Aug 2004 10:21:51 -0000 1.24 @@ -134,7 +134,10 @@ \begin{funcdesc}{getLogger}{\optional{name}} Return a logger with the specified name or, if no name is specified, return -a logger which is the root logger of the hierarchy. +a logger which is the root logger of the hierarchy. If specified, the name +is typically a dot-separated hierarchical name like \var{"a"}, \var{"a.b"} +or \var{"a.b.c.d"}. Choice of these names is entirely up to the developer +who is using logging. All calls to this function with a given name return the same logger instance. This means that logger instances never need to be passed between different

1 0

python/dist/src/Misc NEWS,1.1124,1.1125
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Misc Modified Files: NEWS Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1124 retrieving revision 1.1125 diff -u -d -r1.1124 -r1.1125 --- NEWS 30 Aug 2004 14:27:11 -0000 1.1124 +++ NEWS 31 Aug 2004 10:07:10 -0000 1.1125 @@ -12,6 +12,9 @@ Core and builtins ----------------- +- SF patch #1007189: ``from ... import ...`` statements now allow the name + list to be surrounded by parentheses. + - Some speedups for long arithmetic, thanks to Trevor Perrin. Gradeschool multiplication was sped a little by optimizing the C code. Gradeschool squaring was sped by about a factor of 2, by exploiting that about half @@ -889,7 +892,7 @@ API matches math.log(). - Bug #957381: distutils bdist_rpm no longer fails on recent RPM versions - that generate a *-debuginfo.rpm. + that generate a -debuginfo.rpm - os.path.devnull has been added for all supported platforms.

1 0

[Python-checkins] python/dist/src/Lib/test/output test_grammar, 1.20, 1.21
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib/test/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Lib/test/output Modified Files: test_grammar Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: test_grammar =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/output/test_grammar,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- test_grammar 21 May 2003 17:34:49 -0000 1.20 +++ test_grammar 31 Aug 2004 10:07:09 -0000 1.21 @@ -35,7 +35,8 @@ testing continue and break in try/except in loop return_stmt raise_stmt -import_stmt +import_name +import_from global_stmt exec_stmt assert_stmt

1 0

python/dist/src/Lib/test test_compile.py, 1.22, 1.23 test_grammar.py, 1.50, 1.51 test_parser.py, 1.19, 1.20
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Lib/test Modified Files: test_compile.py test_grammar.py test_parser.py Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: test_compile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_compile.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- test_compile.py 2 Aug 2004 08:30:07 -0000 1.22 +++ test_compile.py 31 Aug 2004 10:07:09 -0000 1.23 @@ -211,6 +211,47 @@ self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'single') self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'exec') + def test_import(self): + succeed = [ + 'import sys', + 'import os, sys', + 'from __future__ import nested_scopes, generators', + 'from __future__ import (nested_scopes,\ngenerators)', + 'from __future__ import (nested_scopes,\ngenerators,)', + 'from sys import stdin, stderr, stdout', + 'from sys import (stdin, stderr,\nstdout)', + 'from sys import (stdin, stderr,\nstdout,)', + 'from sys import (stdin\n, stderr, stdout)', + 'from sys import (stdin\n, stderr, stdout,)', + 'from sys import stdin as si, stdout as so, stderr as se', + 'from sys import (stdin as si, stdout as so, stderr as se)', + 'from sys import (stdin as si, stdout as so, stderr as se,)', + ] + fail = [ + 'import (os, sys)', + 'import (os), (sys)', + 'import ((os), (sys))', + 'import (sys', + 'import sys)', + 'import (os,)', + 'from (sys) import stdin', + 'from __future__ import (nested_scopes', + 'from __future__ import nested_scopes)', + 'from __future__ import nested_scopes,\ngenerators', + 'from sys import (stdin', + 'from sys import stdin)', + 'from sys import stdin, stdout,\nstderr', + 'from sys import stdin si', + 'from sys import stdin,' + 'from sys import (*)', + 'from sys import (stdin,, stdout, stderr)', + 'from sys import (stdin, stdout),', + ] + for stmt in succeed: + compile(stmt, 'tmp', 'exec') + for stmt in fail: + self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'exec') + def test_main(): test_support.run_unittest(TestSpecifics) Index: test_grammar.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_grammar.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- test_grammar.py 19 May 2004 08:20:09 -0000 1.50 +++ test_grammar.py 31 Aug 2004 10:07:09 -0000 1.51 @@ -417,12 +417,16 @@ try: raise KeyboardInterrupt except KeyboardInterrupt: pass -print 'import_stmt' # 'import' NAME (',' NAME)* | 'from' NAME 'import' ('*' | NAME (',' NAME)*) +print 'import_name' # 'import' dotted_as_names import sys import time, sys +print 'import_from' # 'from' dotted_name 'import' ('*' | '(' import_as_names ')' | import_as_names) from time import time +from time import (time) from sys import * from sys import path, argv +from sys import (path, argv) +from sys import (path, argv,) print 'global_stmt' # 'global' NAME (',' NAME)* def f(): Index: test_parser.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_parser.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- test_parser.py 2 Aug 2004 06:09:54 -0000 1.19 +++ test_parser.py 31 Aug 2004 10:07:09 -0000 1.20 @@ -130,12 +130,26 @@ def test_import_from_statement(self): self.check_suite("from sys.path import *") self.check_suite("from sys.path import dirname") + self.check_suite("from sys.path import (dirname)") + self.check_suite("from sys.path import (dirname,)") self.check_suite("from sys.path import dirname as my_dirname") + self.check_suite("from sys.path import (dirname as my_dirname)") + self.check_suite("from sys.path import (dirname as my_dirname,)") self.check_suite("from sys.path import dirname, basename") + self.check_suite("from sys.path import (dirname, basename)") + self.check_suite("from sys.path import (dirname, basename,)") self.check_suite( "from sys.path import dirname as my_dirname, basename") self.check_suite( + "from sys.path import (dirname as my_dirname, basename)") + self.check_suite( + "from sys.path import (dirname as my_dirname, basename,)") + self.check_suite( "from sys.path import dirname, basename as my_basename") + self.check_suite( + "from sys.path import (dirname, basename as my_basename)") + self.check_suite( + "from sys.path import (dirname, basename as my_basename,)") def test_basic_import_statement(self): self.check_suite("import sys")

1 0