mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	Catch syntax errors from processing template lines and turn them into
mere warnings. Call 'findall()' on our FileList object before we start using it seriously.
This commit is contained in:
		
							parent
							
								
									979db976a3
								
							
						
					
					
						commit
						6b24dffd13
					
				
					 1 changed files with 9 additions and 2 deletions
				
			
		| 
						 | 
					@ -14,7 +14,7 @@
 | 
				
			||||||
     create_tree, remove_tree, newer, write_file, \
 | 
					     create_tree, remove_tree, newer, write_file, \
 | 
				
			||||||
     check_archive_formats
 | 
					     check_archive_formats
 | 
				
			||||||
from distutils.text_file import TextFile
 | 
					from distutils.text_file import TextFile
 | 
				
			||||||
from distutils.errors import DistutilsExecError, DistutilsOptionError
 | 
					from distutils.errors import *
 | 
				
			||||||
from distutils.filelist import FileList
 | 
					from distutils.filelist import FileList
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -227,6 +227,8 @@ def get_file_list (self):
 | 
				
			||||||
                           "(using default file list)") %
 | 
					                           "(using default file list)") %
 | 
				
			||||||
                          self.template)
 | 
					                          self.template)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            self.filelist.findall()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            # Add default file set to 'files'
 | 
					            # Add default file set to 'files'
 | 
				
			||||||
            if self.use_defaults:
 | 
					            if self.use_defaults:
 | 
				
			||||||
                self.add_defaults()
 | 
					                self.add_defaults()
 | 
				
			||||||
| 
						 | 
					@ -335,7 +337,12 @@ def read_template (self):
 | 
				
			||||||
            if line is None:            # end of file
 | 
					            if line is None:            # end of file
 | 
				
			||||||
                break
 | 
					                break
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            try:
 | 
				
			||||||
                self.filelist.process_template_line(line)
 | 
					                self.filelist.process_template_line(line)
 | 
				
			||||||
 | 
					            except DistutilsTemplateError, msg:
 | 
				
			||||||
 | 
					                self.warn("%s, line %d: %s" % (template.filename,
 | 
				
			||||||
 | 
					                                               template.current_line,
 | 
				
			||||||
 | 
					                                               msg))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # read_template ()
 | 
					    # read_template ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue