mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	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.
This commit is contained in:
		
							parent
							
								
									9ae09947f4
								
							
						
					
					
						commit
						4114a4afec
					
				
					 4 changed files with 43 additions and 5 deletions
				
			
		
							
								
								
									
										1
									
								
								Lib/__phello__.foo.py
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								Lib/__phello__.foo.py
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | ||||||
|  | # This file exists as a helper for the test.test_frozen module. | ||||||
							
								
								
									
										4
									
								
								Lib/test/output/test_frozen
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								Lib/test/output/test_frozen
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,4 @@ | ||||||
|  | test_frozen | ||||||
|  | Hello world... | ||||||
|  | Hello world... | ||||||
|  | Hello world... | ||||||
							
								
								
									
										26
									
								
								Lib/test/test_frozen.py
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								Lib/test/test_frozen.py
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,26 @@ | ||||||
|  | # Test the frozen module defined in frozen.c. | ||||||
|  | 
 | ||||||
|  | from test_support import TestFailed | ||||||
|  | import sys, os | ||||||
|  | 
 | ||||||
|  | try: | ||||||
|  |     import __hello__ | ||||||
|  | except ImportError, x: | ||||||
|  |     raise TestFailed, "import __hello__ failed:", x | ||||||
|  | 
 | ||||||
|  | try: | ||||||
|  |     import __phello__ | ||||||
|  | except ImportError, x: | ||||||
|  |     raise TestFailed, "import __phello__ failed:", x | ||||||
|  | 
 | ||||||
|  | try: | ||||||
|  |     import __phello__.spam | ||||||
|  | except ImportError, x: | ||||||
|  |     raise TestFailed, "import __phello__.spam failed:", x | ||||||
|  | 
 | ||||||
|  | try: | ||||||
|  |     import __phello__.foo | ||||||
|  | except ImportError: | ||||||
|  |     pass | ||||||
|  | else: | ||||||
|  |     raise TestFailed, "import __phello__.foo should have failed" | ||||||
|  | @ -7,21 +7,28 @@ | ||||||
|    define a single frozen module, __hello__.  Loading it will print |    define a single frozen module, __hello__.  Loading it will print | ||||||
|    some famous words... */ |    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__[] = { | static unsigned char M___hello__[] = { | ||||||
| 	99,0,0,0,0,1,0,0,0,115,15,0,0,0,127,0, | 	99,0,0,0,0,1,0,0,0,115,15,0,0,0,127,0, | ||||||
| 	0,127,1,0,100,0,0,71,72,100,1,0,83,40,2,0, | 	0,127,1,0,100,0,0,71,72,100,1,0,83,40,2,0, | ||||||
| 	0,0,115,14,0,0,0,72,101,108,108,111,32,119,111,114, | 	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, | 	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, | 	40,0,0,0,0,40,0,0,0,0,115,8,0,0,0,104, | ||||||
| 	0,0,63,1,0,115,0,0,0,0, | 	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[] = { | static struct _frozen _PyImport_FrozenModules[] = { | ||||||
| 	/* Test module */ | 	/* Test module */ | ||||||
| 	{"__hello__", M___hello__, 90}, | 	{"__hello__", M___hello__, SIZE}, | ||||||
| 	/* Test package (negative size indicates package-ness) */ | 	/* Test package (negative size indicates package-ness) */ | ||||||
| 	{"__phello__", M___hello__, -90}, | 	{"__phello__", M___hello__, -SIZE}, | ||||||
| 	{"__phello__.spam", M___hello__, 90}, | 	{"__phello__.spam", M___hello__, SIZE}, | ||||||
| 	{0, 0, 0} /* sentinel */ | 	{0, 0, 0} /* sentinel */ | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Guido van Rossum
						Guido van Rossum