mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	Merged revisions 80548-80549 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80548 | benjamin.peterson | 2010-04-27 16:18:30 -0500 (Tue, 27 Apr 2010) | 1 line condense import ........ r80549 | benjamin.peterson | 2010-04-27 16:19:06 -0500 (Tue, 27 Apr 2010) | 1 line correct signature ........
This commit is contained in:
		
							parent
							
								
									ad142d306d
								
							
						
					
					
						commit
						c3be11aac3
					
				
					 1 changed files with 2 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -13,8 +13,7 @@
 | 
			
		|||
    from _dummy_thread import allocate_lock as Lock
 | 
			
		||||
 | 
			
		||||
import io
 | 
			
		||||
from io import __all__
 | 
			
		||||
from io import SEEK_SET, SEEK_CUR, SEEK_END
 | 
			
		||||
from io import (__all__, SEEK_SET, SEEK_CUR, SEEK_END)
 | 
			
		||||
 | 
			
		||||
# open() uses st_blksize whenever we can
 | 
			
		||||
DEFAULT_BUFFER_SIZE = 8 * 1024  # bytes
 | 
			
		||||
| 
						 | 
				
			
			@ -226,7 +225,7 @@ class DocDescriptor:
 | 
			
		|||
    """
 | 
			
		||||
    def __get__(self, obj, typ):
 | 
			
		||||
        return (
 | 
			
		||||
            "open(file, mode='r', buffering=None, encoding=None, "
 | 
			
		||||
            "open(file, mode='r', buffering=-1, encoding=None, "
 | 
			
		||||
                 "errors=None, newline=None, closefd=True)\n\n" +
 | 
			
		||||
            open.__doc__)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue