mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 19:34:08 +00:00 
			
		
		
		
	Update merge from 2.7: s/basetring/str
This commit is contained in:
		
							parent
							
								
									eaae1b76ae
								
							
						
					
					
						commit
						2dceb359cb
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -1957,7 +1957,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
 | 
			
		|||
                    # twice (which may fail) if the argument was given, but
 | 
			
		||||
                    # only if it was defined already in the namespace
 | 
			
		||||
                    if (action.default is not None and
 | 
			
		||||
                            isinstance(action.default, basestring) and
 | 
			
		||||
                            isinstance(action.default, str) and
 | 
			
		||||
                            hasattr(namespace, action.dest) and
 | 
			
		||||
                            action.default is getattr(namespace, action.dest)):
 | 
			
		||||
                        setattr(namespace, action.dest,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue