mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	SF patch 1631942 by Collin Winter:
(a) "except E, V" -> "except E as V" (b) V is now limited to a simple name (local variable) (c) V is now deleted at the end of the except block
This commit is contained in:
		
							parent
							
								
									893523e80a
								
							
						
					
					
						commit
						b940e113bf
					
				
					 295 changed files with 817 additions and 743 deletions
				
			
		| 
						 | 
				
			
			@ -142,13 +142,13 @@ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
 | 
			
		|||
            # gcc needs '.res' and '.rc' compiled to object files !!!
 | 
			
		||||
            try:
 | 
			
		||||
                self.spawn(["windres", "-i", src, "-o", obj])
 | 
			
		||||
            except DistutilsExecError, msg:
 | 
			
		||||
            except DistutilsExecError as msg:
 | 
			
		||||
                raise CompileError, msg
 | 
			
		||||
        else: # for other files use the C-compiler
 | 
			
		||||
            try:
 | 
			
		||||
                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
 | 
			
		||||
                           extra_postargs)
 | 
			
		||||
            except DistutilsExecError, msg:
 | 
			
		||||
            except DistutilsExecError as msg:
 | 
			
		||||
                raise CompileError, msg
 | 
			
		||||
 | 
			
		||||
    def link (self,
 | 
			
		||||
| 
						 | 
				
			
			@ -379,7 +379,7 @@ def check_config_h():
 | 
			
		|||
        s = f.read()
 | 
			
		||||
        f.close()
 | 
			
		||||
 | 
			
		||||
    except IOError, exc:
 | 
			
		||||
    except IOError as exc:
 | 
			
		||||
        # if we can't read this file, we cannot say it is wrong
 | 
			
		||||
        # the compiler will complain later about this file as missing
 | 
			
		||||
        return (CONFIG_H_UNCERTAIN,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue