Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Doc/ref Modified Files: ref6.tex Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: ref6.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref6.tex,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- ref6.tex 3 Aug 2004 05:17:57 -0000 1.71 +++ ref6.tex 31 Aug 2004 10:06:59 -0000 1.72 @@ -623,6 +623,9 @@ \productioncont{| "from" \token{module} "import" \token{identifier} ["as" \token{name}]} \productioncont{ ( "," \token{identifier} ["as" \token{name}] )*} + \productioncont{| "from" \token{module} "import" "(" \token{identifier} + ["as" \token{name}]} + \productioncont{ ( "," \token{identifier} ["as" \token{name}] )* [","] ")"} \productioncont{| "from" \token{module} "import" "*"} \production{module} {(\token{identifier} ".")* \token{identifier}} @@ -744,8 +747,8 @@ \begin{productionlist}[*] \production{future_statement} - {"from" "__future__" "import" feature ["as" name]} - \productioncont{("," feature ["as" name])*} + {"from" "__future__" "import" feature ["as" name] ("," feature ["as" name])*} + \productioncont{| "from" "__future__" "import" "(" feature ["as" name] ("," feature ["as" name])* [","] ")"} \production{feature}{identifier} \production{name}{identifier} \end{productionlist}