mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	Patch #685268: Consider a package's __path__ in imputil.
Will backport.
This commit is contained in:
		
							parent
							
								
									b8d6d73121
								
							
						
					
					
						commit
						07aa3ed372
					
				
					 2 changed files with 6 additions and 0 deletions
				
			
		| 
						 | 
					@ -552,6 +552,10 @@ def get_code(self, parent, modname, fqname):
 | 
				
			||||||
        # This method is only used when we look for a module within a package.
 | 
					        # This method is only used when we look for a module within a package.
 | 
				
			||||||
        assert parent
 | 
					        assert parent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for submodule_path in parent.__path__:
 | 
				
			||||||
 | 
					            code = self._import_pathname(_os_path_join(submodule_path, modname), fqname)
 | 
				
			||||||
 | 
					            if code is not None:
 | 
				
			||||||
 | 
					                return code
 | 
				
			||||||
        return self._import_pathname(_os_path_join(parent.__pkgdir__, modname),
 | 
					        return self._import_pathname(_os_path_join(parent.__pkgdir__, modname),
 | 
				
			||||||
                                     fqname)
 | 
					                                     fqname)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -128,6 +128,8 @@ Core and builtins
 | 
				
			||||||
Library
 | 
					Library
 | 
				
			||||||
-------
 | 
					-------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Patch #685268: Consider a package's __path__ in imputil.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Patch 1463026: Support default namespace in XMLGenerator.
 | 
					- Patch 1463026: Support default namespace in XMLGenerator.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Patch 1571379: Make trace's --ignore-dir facility work in the face of
 | 
					- Patch 1571379: Make trace's --ignore-dir facility work in the face of
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue