[Python-checkins] python/dist/src/Lib/compiler transformer.py, 1.48, 1.49

Mon Nov 8 13:17:37 CET 2004

Update of /cvsroot/python/python/dist/src/Lib/compiler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24130
Modified Files:
	transformer.py 
Log Message:
Fix bug
[ 1057835 ] compiler.transformer, "from module import *"
Index: transformer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/compiler/transformer.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49

--- transformer.py	11 Oct 2004 15:35:53 -0000	1.48
+++ transformer.py	8 Nov 2004 12:17:34 -0000	1.49
@@ -437,8 +437,8 @@
 assert nodelist[2][1] == 'import'
 fromname = self.com_dotted_name(nodelist[1])
 if nodelist[3][0] == token.STAR:
- # TODO(jhylton): where is the lineno?
- return From(fromname, [('*', None)])
+ return From(fromname, [('*', None)],
+ lineno=nodelist[0][2])
 else:
 node = nodelist[3 + (nodelist[3][0] == token.LPAR)]
 return From(fromname, self.com_import_as_names(node),
