[Python-checkins] CVS: python/dist/src/Python ceval.c,2.191,2.192

Thomas Wouters python-dev@python.org
Sun, 20 Aug 2000 07:01:57 -0700


Update of /cvsroot/python/python/dist/src/Python
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6504/Python

Modified Files:
	ceval.c 
Log Message:

Fix the bug Sjoerd Mullender discovered, where find_from_args() wasn't
trying hard enough to find out what the arguments to an import were. There
is no test-case for this bug, yet, but this is what it looked like:

from encodings import cp1006, cp1026
ImportError: cannot import name cp1026

'__import__' was called with only the first name in the 'arguments' list.



Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.191
retrieving revision 2.192
diff -C2 -r2.191 -r2.192
*** ceval.c	2000/08/18 19:53:25	2.191
--- ceval.c	2000/08/20 14:01:53	2.192
***************
*** 2865,2869 ****
  		do {
  			oparg = (next_instr[1]<<8) + next_instr[0];
! 			next_instr += 2;
  			name = Getnamev(f, oparg);
  			if (PyList_Append(list, name) < 0) {
--- 2865,2871 ----
  		do {
  			oparg = (next_instr[1]<<8) + next_instr[0];
! 			/* Jump over our own argument, the next instruction
! 			   (which is a STORE), and its argument.*/
! 			next_instr += 5;
  			name = Getnamev(f, oparg);
  			if (PyList_Append(list, name) < 0) {