[Python-checkins] CVS: python/dist/src/Python frozen.c,1.9,1.10

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv9628/Python

Modified Files:
	frozen.c 
Log Message:
Fix the frozen bytecode for __hello__ (betcha didn't know that existed
:-).

Add a test that prevents the __hello__ bytecode from going stale
unnoticed again.

The test also tests the loophole noted in SF bug #404545.  This test
will fail right now; I'll check in the fix in a minute.



Index: frozen.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/frozen.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** frozen.c	2000/09/01 23:29:28	1.9
--- frozen.c	2001/10/18 18:49:37	1.10
***************
*** 8,11 ****
--- 8,15 ----
     some famous words... */
  
+ /* To regenerate this data after the bytecode or marshal format has changed,
+    go to ../Tools/freeze/ and freeze the hello.py file; then copy and paste
+    the appropriate bytes from M___main__.c. */
+ 
  static unsigned char M___hello__[] = {
  	99,0,0,0,0,1,0,0,0,115,15,0,0,0,127,0,
***************
*** 13,26 ****
  	0,0,115,14,0,0,0,72,101,108,108,111,32,119,111,114,
  	108,100,46,46,46,78,40,0,0,0,0,40,0,0,0,0,
! 	115,8,0,0,0,104,101,108,108,111,46,112,121,115,1,0,
! 	0,0,63,1,0,115,0,0,0,0,
  };
  
  static struct _frozen _PyImport_FrozenModules[] = {
  	/* Test module */
! 	{"__hello__", M___hello__, 90},
  	/* Test package (negative size indicates package-ness) */
! 	{"__phello__", M___hello__, -90},
! 	{"__phello__.spam", M___hello__, 90},
  	{0, 0, 0} /* sentinel */
  };
--- 17,33 ----
  	0,0,115,14,0,0,0,72,101,108,108,111,32,119,111,114,
  	108,100,46,46,46,78,40,0,0,0,0,40,0,0,0,0,
! 	40,0,0,0,0,40,0,0,0,0,115,8,0,0,0,104,
! 	101,108,108,111,46,112,121,115,1,0,0,0,63,1,0,115,
! 	0,0,0,0,
  };
  
+ #define SIZE sizeof(M___hello__)
+ 
  static struct _frozen _PyImport_FrozenModules[] = {
  	/* Test module */
! 	{"__hello__", M___hello__, SIZE},
  	/* Test package (negative size indicates package-ness) */
! 	{"__phello__", M___hello__, -SIZE},
! 	{"__phello__.spam", M___hello__, SIZE},
  	{0, 0, 0} /* sentinel */
  };