[Python-checkins] python/dist/src/Modules cPickle.c,2.97,2.98

gvanrossum@users.sourceforge.net gvanrossum@users.sourceforge.net
Tue, 24 Dec 2002 10:10:10 -0800


Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv27201

Modified Files:
	cPickle.c 
Log Message:
Add an XXX comment about relative imports.


Index: cPickle.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.97
retrieving revision 2.98
diff -C2 -d -r2.97 -r2.98
*** cPickle.c	7 Dec 2002 02:43:28 -0000	2.97
--- cPickle.c	24 Dec 2002 18:10:07 -0000	2.98
***************
*** 1714,1720 ****
  	name_str   = PyString_AS_STRING((PyStringObject *)global_name);
  
  	mod = PyImport_ImportModule(module_str);
  	if (mod == NULL) {
- 		/* Py_ErrClear(); ?? */
  		cPickle_ErrFormat(PicklingError,
  				  "Can't pickle %s: it's not found as %s.%s",
--- 1714,1721 ----
  	name_str   = PyString_AS_STRING((PyStringObject *)global_name);
  
+ 	/* XXX This can be doing a relative import.  Clearly it shouldn't,
+ 	   but I don't know how to stop it. :-( */
  	mod = PyImport_ImportModule(module_str);
  	if (mod == NULL) {
  		cPickle_ErrFormat(PicklingError,
  				  "Can't pickle %s: it's not found as %s.%s",