mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	Merged revisions 79271 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r79271 | victor.stinner | 2010-03-22 02:58:35 +0100 (lun., 22 mars 2010) | 4 lines Issue #4282: Fix the main function of the profile module for a non-ASCII script, open the file in binary mode and not in text mode with the default (utf8) encoding. ........
This commit is contained in:
		
							parent
							
								
									4e74fc82ea
								
							
						
					
					
						commit
						cfbb23a4dd
					
				
					 2 changed files with 5 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -609,11 +609,8 @@ def main():
 | 
			
		|||
    if (len(args) > 0):
 | 
			
		||||
        sys.argv[:] = args
 | 
			
		||||
        sys.path.insert(0, os.path.dirname(sys.argv[0]))
 | 
			
		||||
        fp = open(sys.argv[0])
 | 
			
		||||
        try:
 | 
			
		||||
        with open(sys.argv[0], 'rb') as fp:
 | 
			
		||||
            script = fp.read()
 | 
			
		||||
        finally:
 | 
			
		||||
            fp.close()
 | 
			
		||||
        run('exec(%r)' % script, options.outfile, options.sort)
 | 
			
		||||
    else:
 | 
			
		||||
        parser.print_usage()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -143,6 +143,10 @@ Core and Builtins
 | 
			
		|||
Library
 | 
			
		||||
-------
 | 
			
		||||
 | 
			
		||||
- Issue #4282: Fix the main function of the profile module for a non-ASCII
 | 
			
		||||
  script, open the file in binary mode and not in text mode with the default
 | 
			
		||||
  (utf8) encoding.
 | 
			
		||||
 | 
			
		||||
- Issue #7774: Set sys.executable to an empty string if argv[0] has been set to
 | 
			
		||||
  an non existent program name and Python is unable to retrieve the real
 | 
			
		||||
  program name
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue