mirror of
				https://github.com/python/cpython.git
				synced 2025-10-30 21:21:22 +00:00 
			
		
		
		
	Some syntax errors were being caught by tokenize during the tabnanny
check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719
This commit is contained in:
		
							parent
							
								
									54c3db55a2
								
							
						
					
					
						commit
						c426ffcdfc
					
				
					 2 changed files with 8 additions and 6 deletions
				
			
		|  | @ -57,9 +57,10 @@ def check_module_event(self, event): | |||
|         filename = self.getfilename() | ||||
|         if not filename: | ||||
|             return | ||||
|         if not self.checksyntax(filename): | ||||
|             return | ||||
|         if not self.tabnanny(filename): | ||||
|             return | ||||
|         self.checksyntax(filename) | ||||
| 
 | ||||
|     def tabnanny(self, filename): | ||||
|         f = open(filename, 'r') | ||||
|  | @ -76,9 +77,6 @@ def tabnanny(self, filename): | |||
|             self.editwin.gotoline(nag.get_lineno()) | ||||
|             self.errorbox("Tab/space error", indent_message) | ||||
|             return False | ||||
|         except IndentationError: | ||||
|             # From tokenize(), let compile() in checksyntax find it again. | ||||
|             pass | ||||
|         return True | ||||
| 
 | ||||
|     def checksyntax(self, filename): | ||||
|  | @ -139,11 +137,11 @@ def run_module_event(self, event): | |||
|         filename = self.getfilename() | ||||
|         if not filename: | ||||
|             return | ||||
|         if not self.tabnanny(filename): | ||||
|             return | ||||
|         code = self.checksyntax(filename) | ||||
|         if not code: | ||||
|             return | ||||
|         if not self.tabnanny(filename): | ||||
|             return | ||||
|         shell = self.shell | ||||
|         interp = shell.interp | ||||
|         if PyShell.use_subprocess: | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Kurt B. Kaiser
						Kurt B. Kaiser