cpython-lru_cache-weakref: Lib/io.py annotate

annotate Lib/io.py @ 58925:eecf1bef052d 2.6

Merged revisions 78207 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78207 | ezio.melotti | 2010-02-17 01:26:09 +0200 (Wed, 17 Feb 2010) | 1 line #7930: fix stripid ........

author	Ezio Melotti <ezio.melotti@gmail.com>
date	Tue, 16 Feb 2010 23:29:44 +0000
parents	0bd616dfc977
children	fe3bf399a19c

rev	line source
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1 """
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	2 The io module provides the Python interfaces to stream handling. The
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	3 builtin open function is defined in this module.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	4
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	5 At the top of the I/O hierarchy is the abstract base class IOBase. It
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	6 defines the basic interface to a stream. Note, however, that there is no
55049 74c0a78114ae Merged revisions 69846 via svnmerge from Jesus Cea <jcea@jcea.es> parents: 54722 diff changeset	7 separation between reading and writing to streams; implementations are
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	8 allowed to throw an IOError if they do not support a given operation.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	9
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	10 Extending IOBase is RawIOBase which deals simply with the reading and
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	11 writing of raw bytes to a stream. FileIO subclasses RawIOBase to provide
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	12 an interface to OS files.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	13
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	14 BufferedIOBase deals with buffering on a raw byte stream (RawIOBase). Its
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	15 subclasses, BufferedWriter, BufferedReader, and BufferedRWPair buffer
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	16 streams that are readable, writable, and both respectively.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	17 BufferedRandom provides a buffered interface to random access
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	18 streams. BytesIO is a simple stream of in-memory bytes.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	19
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	20 Another IOBase subclass, TextIOBase, deals with the encoding and decoding
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	21 of streams into text. TextIOWrapper, which extends it, is a buffered text
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	22 interface to a buffered raw stream (`BufferedIOBase`). Finally, StringIO
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	23 is a in-memory stream for text.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	24
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	25 Argument names are not part of the specification, and only the arguments
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	26 of open() are intended to be used as keyword arguments.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	27
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	28 data:
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	29
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	30 DEFAULT_BUFFER_SIZE
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	31
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	32 An int containing the default buffer size used by the module's buffered
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	33 I/O classes. open() uses the file's blksize (as obtained by os.stat) if
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	34 possible.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	35 """
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	36 # New I/O library conforming to PEP 3116.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	37
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	38 # This is a prototype; hopefully eventually some of this will be
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	39 # reimplemented in C.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	40
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	41 # XXX edge cases when switching between reading/writing
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	42 # XXX need to support 1 meaning line-buffered
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	43 # XXX whenever an argument is None, use the default value
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	44 # XXX read/write ops should check readable/writable
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	45 # XXX buffered readinto should work with arbitrary buffer objects
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	46 # XXX use incremental encoder for text output, at least for UTF-16 and UTF-8-SIG
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	47 # XXX check writable, readable and seekable in appropriate places
46124 38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	48 from __future__ import print_function
38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	49 from __future__ import unicode_literals
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	50
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	51 __author__ = ("Guido van Rossum <guido@python.org>, "
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	52 "Mike Verdone <mike.verdone@gmail.com>, "
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	53 "Mark Russell <mark.russell@zen.co.uk>")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	54
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	55 __all__ = ["BlockingIOError", "open", "IOBase", "RawIOBase", "FileIO",
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	56 "BytesIO", "StringIO", "BufferedIOBase",
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	57 "BufferedReader", "BufferedWriter", "BufferedRWPair",
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	58 "BufferedRandom", "TextIOBase", "TextIOWrapper"]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	59
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	60 import os
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	61 import abc
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	62 import codecs
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	63 import _fileio
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	64 import threading
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	65
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	66 # open() uses st_blksize whenever we can
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	67 DEFAULT_BUFFER_SIZE = 8 * 1024 # bytes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	68
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	69 # py3k has only new style classes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	70 __metaclass__ = type
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	71
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	72 class BlockingIOError(IOError):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	73
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	74 """Exception raised when I/O would block on a non-blocking I/O stream."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	75
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	76 def __init__(self, errno, strerror, characters_written=0):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	77 IOError.__init__(self, errno, strerror)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	78 self.characters_written = characters_written
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	79
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	80
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	81 def open(file, mode="r", buffering=None, encoding=None, errors=None,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	82 newline=None, closefd=True):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	83 r"""Open file and return a stream. If the file cannot be opened, an IOError is
643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	84 raised.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	85
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	86 file is either a string giving the name (and the path if the file
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	87 isn't in the current working directory) of the file to be opened or an
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	88 integer file descriptor of the file to be wrapped. (If a file
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	89 descriptor is given, it is closed when the returned I/O object is
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	90 closed, unless closefd is set to False.)
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	91
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	92 mode is an optional string that specifies the mode in which the file
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	93 is opened. It defaults to 'r' which means open for reading in text
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	94 mode. Other common values are 'w' for writing (truncating the file if
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	95 it already exists), and 'a' for appending (which on some Unix systems,
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	96 means that all writes append to the end of the file regardless of the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	97 current seek position). In text mode, if encoding is not specified the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	98 encoding used is platform dependent. (For reading and writing raw
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	99 bytes use binary mode and leave encoding unspecified.) The available
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	100 modes are:
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	101
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	102 ========= ===============================================================
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	103 Character Meaning
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	104 --------- ---------------------------------------------------------------
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	105 'r' open for reading (default)
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	106 'w' open for writing, truncating the file first
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	107 'a' open for writing, appending to the end of the file if it exists
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	108 'b' binary mode
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	109 't' text mode (default)
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	110 '+' open a disk file for updating (reading and writing)
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	111 'U' universal newline mode (for backwards compatibility; unneeded
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	112 for new code)
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	113 ========= ===============================================================
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	114
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	115 The default mode is 'rt' (open for reading text). For binary random
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	116 access, the mode 'w+b' opens and truncates the file to 0 bytes, while
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	117 'r+b' opens the file without truncation.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	118
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	119 Python distinguishes between files opened in binary and text modes,
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	120 even when the underlying operating system doesn't. Files opened in
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	121 binary mode (appending 'b' to the mode argument) return contents as
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	122 bytes objects without any decoding. In text mode (the default, or when
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	123 't' is appended to the mode argument), the contents of the file are
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	124 returned as strings, the bytes having been first decoded using a
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	125 platform-dependent encoding or using the specified encoding if given.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	126
57788 6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	127 buffering is an optional integer used to set the buffering policy.
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	128 Pass 0 to switch buffering off (only allowed in binary mode), 1 to select
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	129 line buffering (only usable in text mode), and an integer > 1 to indicate
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	130 the size of a fixed-size chunk buffer. When no buffering argument is
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	131 given, the default buffering policy works as follows:
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	132
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	133 * Binary files are buffered in fixed-size chunks; the size of the buffer
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	134 is chosen using a heuristic trying to determine the underlying device's
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	135 "block size" and falling back on `io.DEFAULT_BUFFER_SIZE`.
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	136 On many systems, the buffer will typically be 4096 or 8192 bytes long.
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	137
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	138 * "Interactive" text files (files for which isatty() returns True)
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	139 use line buffering. Other text files use the policy described above
6d47b2494713 Merged revisions 76896 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55049 diff changeset	140 for binary files.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	141
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	142 encoding is the name of the encoding used to decode or encode the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	143 file. This should only be used in text mode. The default encoding is
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	144 platform dependent, but any encoding supported by Python can be
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	145 passed. See the codecs module for the list of supported encodings.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	146
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	147 errors is an optional string that specifies how encoding errors are to
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	148 be handled---this argument should not be used in binary mode. Pass
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	149 'strict' to raise a ValueError exception if there is an encoding error
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	150 (the default of None has the same effect), or pass 'ignore' to ignore
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	151 errors. (Note that ignoring encoding errors can lead to data loss.)
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	152 See the documentation for codecs.register for a list of the permitted
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	153 encoding error strings.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	154
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	155 newline controls how universal newlines works (it only applies to text
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	156 mode). It can be None, '', '\n', '\r', and '\r\n'. It works as
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	157 follows:
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	158
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	159 * On input, if newline is None, universal newlines mode is
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	160 enabled. Lines in the input can end in '\n', '\r', or '\r\n', and
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	161 these are translated into '\n' before being returned to the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	162 caller. If it is '', universal newline mode is enabled, but line
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	163 endings are returned to the caller untranslated. If it has any of
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	164 the other legal values, input lines are only terminated by the given
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	165 string, and the line ending is returned to the caller untranslated.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	166
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	167 * On output, if newline is None, any '\n' characters written are
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	168 translated to the system default line separator, os.linesep. If
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	169 newline is '', no translation takes place. If newline is any of the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	170 other legal values, any '\n' characters written are translated to
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	171 the given string.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	172
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	173 If closefd is False, the underlying file descriptor will be kept open
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	174 when the file is closed. This does not work when a file name is given
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	175 and must be True in that case.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	176
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	177 open() returns a file object whose type depends on the mode, and
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	178 through which the standard file operations such as reading and writing
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	179 are performed. When open() is used to open a file in a text mode ('w',
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	180 'r', 'wt', 'rt', etc.), it returns a TextIOWrapper. When used to open
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	181 a file in a binary mode, the returned class varies: in read binary
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	182 mode, it returns a BufferedReader; in write binary and append binary
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	183 modes, it returns a BufferedWriter, and in read/write mode, it returns
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	184 a BufferedRandom.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	185
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	186 It is also possible to use a string or bytearray as a file for both
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	187 reading and writing. For strings StringIO can be used like a file
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	188 opened in a text mode, and for bytes a BytesIO can be used like a file
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	189 opened in a binary mode.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	190 """
46124 38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	191 if not isinstance(file, (basestring, int)):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	192 raise TypeError("invalid file: %r" % file)
46124 38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	193 if not isinstance(mode, basestring):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	194 raise TypeError("invalid mode: %r" % mode)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	195 if buffering is not None and not isinstance(buffering, int):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	196 raise TypeError("invalid buffering: %r" % buffering)
46124 38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	197 if encoding is not None and not isinstance(encoding, basestring):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	198 raise TypeError("invalid encoding: %r" % encoding)
46124 38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	199 if errors is not None and not isinstance(errors, basestring):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	200 raise TypeError("invalid errors: %r" % errors)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	201 modes = set(mode)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	202 if modes - set("arwb+tU") or len(mode) > len(modes):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	203 raise ValueError("invalid mode: %r" % mode)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	204 reading = "r" in modes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	205 writing = "w" in modes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	206 appending = "a" in modes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	207 updating = "+" in modes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	208 text = "t" in modes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	209 binary = "b" in modes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	210 if "U" in modes:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	211 if writing or appending:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	212 raise ValueError("can't use U and writing mode at once")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	213 reading = True
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	214 if text and binary:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	215 raise ValueError("can't have text and binary mode at once")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	216 if reading + writing + appending > 1:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	217 raise ValueError("can't have read/write/append mode at once")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	218 if not (reading or writing or appending):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	219 raise ValueError("must have exactly one of read/write/append mode")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	220 if binary and encoding is not None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	221 raise ValueError("binary mode doesn't take an encoding argument")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	222 if binary and errors is not None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	223 raise ValueError("binary mode doesn't take an errors argument")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	224 if binary and newline is not None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	225 raise ValueError("binary mode doesn't take a newline argument")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	226 raw = FileIO(file,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	227 (reading and "r" or "") +
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	228 (writing and "w" or "") +
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	229 (appending and "a" or "") +
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	230 (updating and "+" or ""),
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	231 closefd)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	232 if buffering is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	233 buffering = -1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	234 line_buffering = False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	235 if buffering == 1 or buffering < 0 and raw.isatty():
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	236 buffering = -1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	237 line_buffering = True
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	238 if buffering < 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	239 buffering = DEFAULT_BUFFER_SIZE
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	240 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	241 bs = os.fstat(raw.fileno()).st_blksize
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	242 except (os.error, AttributeError):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	243 pass
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	244 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	245 if bs > 1:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	246 buffering = bs
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	247 if buffering < 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	248 raise ValueError("invalid buffering size")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	249 if buffering == 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	250 if binary:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	251 return raw
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	252 raise ValueError("can't have unbuffered text I/O")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	253 if updating:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	254 buffer = BufferedRandom(raw, buffering)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	255 elif writing or appending:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	256 buffer = BufferedWriter(raw, buffering)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	257 elif reading:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	258 buffer = BufferedReader(raw, buffering)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	259 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	260 raise ValueError("unknown mode: %r" % mode)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	261 if binary:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	262 return buffer
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	263 text = TextIOWrapper(buffer, encoding, errors, newline, line_buffering)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	264 text.mode = mode
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	265 return text
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	266
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	267 class _DocDescriptor:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	268 """Helper for builtins.open.__doc__
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	269 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	270 def __get__(self, obj, typ):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	271 return (
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	272 "open(file, mode='r', buffering=None, encoding=None, "
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	273 "errors=None, newline=None, closefd=True)\n\n" +
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	274 open.__doc__)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	275
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	276 class OpenWrapper:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	277 """Wrapper for builtins.open
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	278
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	279 Trick so that open won't become a bound method when stored
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	280 as a class variable (as dumbdbm does).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	281
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	282 See initstdio() in Python/pythonrun.c.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	283 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	284 __doc__ = _DocDescriptor()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	285
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	286 def __new__(cls, args, *kwargs):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	287 return open(args, *kwargs)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	288
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	289
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	290 class UnsupportedOperation(ValueError, IOError):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	291 pass
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	292
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	293
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	294 class IOBase(object):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	295
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	296 """The abstract base class for all I/O classes, acting on streams of
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	297 bytes. There is no public constructor.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	298
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	299 This class provides dummy implementations for many methods that
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	300 derived classes can override selectively; the default implementations
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	301 represent a file that cannot be read, written or seeked.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	302
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	303 Even though IOBase does not declare read, readinto, or write because
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	304 their signatures will vary, implementations and clients should
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	305 consider those methods part of the interface. Also, implementations
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	306 may raise a IOError when operations they do not support are called.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	307
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	308 The basic type used for binary data read from or written to a file is
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	309 bytes. bytearrays are accepted too, and in some cases (such as
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	310 readinto) needed. Text I/O classes work with str data.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	311
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	312 Note that calling any method (even inquiries) on a closed stream is
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	313 undefined. Implementations may raise IOError in this case.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	314
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	315 IOBase (and its subclasses) support the iterator protocol, meaning
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	316 that an IOBase object can be iterated over yielding the lines in a
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	317 stream.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	318
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	319 IOBase also supports the :keyword:`with` statement. In this example,
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	320 fp is closed after the suite of the with statment is complete:
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	321
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	322 with open('spam.txt', 'r') as fp:
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	323 fp.write('Spam and eggs!')
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	324 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	325
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	326 __metaclass__ = abc.ABCMeta
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	327
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	328 ### Internal ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	329
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	330 def _unsupported(self, name):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	331 """Internal: raise an exception for unsupported operations."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	332 raise UnsupportedOperation("%s.%s() not supported" %
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	333 (self.__class__.__name__, name))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	334
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	335 ### Positioning ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	336
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	337 def seek(self, pos, whence = 0):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	338 """Change stream position.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	339
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	340 Change the stream position to byte offset offset. offset is
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	341 interpreted relative to the position indicated by whence. Values
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	342 for whence are:
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	343
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	344 * 0 -- start of stream (the default); offset should be zero or positive
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	345 * 1 -- current stream position; offset may be negative
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	346 * 2 -- end of stream; offset is usually negative
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	347
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	348 Return the new absolute position.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	349 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	350 self._unsupported("seek")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	351
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	352 def tell(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	353 """Return current stream position."""
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	354 return self.seek(0, 1)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	355
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	356 def truncate(self, pos = None):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	357 """Truncate file to size bytes.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	358
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	359 Size defaults to the current IO position as reported by tell(). Return
643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	360 the new size.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	361 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	362 self._unsupported("truncate")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	363
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	364 ### Flush and close ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	365
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	366 def flush(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	367 """Flush write buffers, if applicable.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	368
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	369 This is not implemented for read-only and non-blocking streams.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	370 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	371 # XXX Should this return the number of bytes written???
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	372
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	373 __closed = False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	374
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	375 def close(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	376 """Flush and close the IO object.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	377
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	378 This method has no effect if the file is already closed.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	379 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	380 if not self.__closed:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	381 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	382 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	383 except IOError:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	384 pass # If flush() fails, just give up
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	385 self.__closed = True
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	386
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	387 def __del__(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	388 """Destructor. Calls close()."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	389 # The try/except block is in case this is called at program
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	390 # exit time, when it's possible that globals have already been
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	391 # deleted, and then the close() call might fail. Since
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	392 # there's nothing we can do about such failures and they annoy
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	393 # the end users, we suppress the traceback.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	394 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	395 self.close()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	396 except:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	397 pass
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	398
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	399 ### Inquiries ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	400
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	401 def seekable(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	402 """Return whether object supports random access.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	403
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	404 If False, seek(), tell() and truncate() will raise IOError.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	405 This method may need to do a test seek().
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	406 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	407 return False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	408
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	409 def _checkSeekable(self, msg=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	410 """Internal: raise an IOError if file is not seekable
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	411 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	412 if not self.seekable():
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	413 raise IOError("File or stream is not seekable."
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	414 if msg is None else msg)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	415
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	416
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	417 def readable(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	418 """Return whether object was opened for reading.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	419
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	420 If False, read() will raise IOError.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	421 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	422 return False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	423
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	424 def _checkReadable(self, msg=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	425 """Internal: raise an IOError if file is not readable
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	426 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	427 if not self.readable():
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	428 raise IOError("File or stream is not readable."
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	429 if msg is None else msg)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	430
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	431 def writable(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	432 """Return whether object was opened for writing.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	433
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	434 If False, write() and truncate() will raise IOError.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	435 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	436 return False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	437
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	438 def _checkWritable(self, msg=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	439 """Internal: raise an IOError if file is not writable
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	440 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	441 if not self.writable():
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	442 raise IOError("File or stream is not writable."
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	443 if msg is None else msg)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	444
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	445 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	446 def closed(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	447 """closed: bool. True iff the file has been closed.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	448
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	449 For backwards compatibility, this is a property, not a predicate.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	450 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	451 return self.__closed
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	452
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	453 def _checkClosed(self, msg=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	454 """Internal: raise an ValueError if file is closed
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	455 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	456 if self.closed:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	457 raise ValueError("I/O operation on closed file."
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	458 if msg is None else msg)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	459
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	460 ### Context manager ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	461
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	462 def __enter__(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	463 """Context management protocol. Returns self."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	464 self._checkClosed()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	465 return self
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	466
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	467 def __exit__(self, *args):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	468 """Context management protocol. Calls close()"""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	469 self.close()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	470
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	471 ### Lower-level APIs ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	472
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	473 # XXX Should these be present even if unimplemented?
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	474
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	475 def fileno(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	476 """Returns underlying file descriptor if one exists.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	477
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	478 An IOError is raised if the IO object does not use a file descriptor.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	479 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	480 self._unsupported("fileno")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	481
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	482 def isatty(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	483 """Return whether this is an 'interactive' stream.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	484
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	485 Return False if it can't be determined.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	486 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	487 self._checkClosed()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	488 return False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	489
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	490 ### Readline[s] and writelines ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	491
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	492 def readline(self, limit = -1):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	493 r"""Read and return a line from the stream.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	494
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	495 If limit is specified, at most limit bytes will be read.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	496
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	497 The line terminator is always b'\n' for binary files; for text
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	498 files, the newlines argument to open can be used to select the line
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	499 terminator(s) recognized.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	500 """
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	501 self._checkClosed()
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	502 if hasattr(self, "peek"):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	503 def nreadahead():
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	504 readahead = self.peek(1)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	505 if not readahead:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	506 return 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	507 n = (readahead.find(b"\n") + 1) or len(readahead)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	508 if limit >= 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	509 n = min(n, limit)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	510 return n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	511 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	512 def nreadahead():
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	513 return 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	514 if limit is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	515 limit = -1
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	516 if not isinstance(limit, (int, long)):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	517 raise TypeError("limit must be an integer")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	518 res = bytearray()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	519 while limit < 0 or len(res) < limit:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	520 b = self.read(nreadahead())
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	521 if not b:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	522 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	523 res += b
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	524 if res.endswith(b"\n"):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	525 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	526 return bytes(res)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	527
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	528 def __iter__(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	529 self._checkClosed()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	530 return self
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	531
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	532 def next(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	533 line = self.readline()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	534 if not line:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	535 raise StopIteration
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	536 return line
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	537
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	538 def readlines(self, hint=None):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	539 """Return a list of lines from the stream.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	540
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	541 hint can be specified to control the number of lines read: no more
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	542 lines will be read if the total size (in bytes/characters) of all
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	543 lines so far exceeds hint.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	544 """
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	545 if hint is None:
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	546 hint = -1
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	547 if not isinstance(hint, (int, long)):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	548 raise TypeError("hint must be an integer")
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	549 if hint <= 0:
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	550 return list(self)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	551 n = 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	552 lines = []
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	553 for line in self:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	554 lines.append(line)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	555 n += len(line)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	556 if n >= hint:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	557 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	558 return lines
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	559
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	560 def writelines(self, lines):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	561 self._checkClosed()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	562 for line in lines:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	563 self.write(line)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	564
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	565
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	566 class RawIOBase(IOBase):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	567
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	568 """Base class for raw binary I/O."""
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	569
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	570 # The read() method is implemented by calling readinto(); derived
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	571 # classes that want to support read() only need to implement
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	572 # readinto() as a primitive operation. In general, readinto() can be
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	573 # more efficient than read().
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	574
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	575 # (It would be tempting to also provide an implementation of
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	576 # readinto() in terms of read(), in case the latter is a more suitable
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	577 # primitive operation, but that would lead to nasty recursion in case
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	578 # a subclass doesn't implement either.)
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	579
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	580 def read(self, n = -1):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	581 """Read and return up to n bytes.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	582
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	583 Returns an empty bytes array on EOF, or None if the object is
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	584 set not to block and has no data to read.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	585 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	586 if n is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	587 n = -1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	588 if n < 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	589 return self.readall()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	590 b = bytearray(n.__index__())
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	591 n = self.readinto(b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	592 del b[n:]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	593 return bytes(b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	594
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	595 def readall(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	596 """Read until EOF, using multiple read() call."""
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	597 res = bytearray()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	598 while True:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	599 data = self.read(DEFAULT_BUFFER_SIZE)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	600 if not data:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	601 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	602 res += data
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	603 return bytes(res)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	604
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	605 def readinto(self, b):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	606 """Read up to len(b) bytes into b.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	607
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	608 Returns number of bytes read (0 for EOF), or None if the object
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	609 is set not to block as has no data to read.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	610 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	611 self._unsupported("readinto")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	612
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	613 def write(self, b):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	614 """Write the given buffer to the IO stream.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	615
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	616 Returns the number of bytes written, which may be less than len(b).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	617 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	618 self._unsupported("write")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	619
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	620
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	621 class FileIO(_fileio._FileIO, RawIOBase):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	622
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	623 """Raw I/O implementation for OS files."""
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	624
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	625 # This multiply inherits from _FileIO and RawIOBase to make
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	626 # isinstance(io.FileIO(), io.RawIOBase) return True without requiring
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	627 # that _fileio._FileIO inherits from io.RawIOBase (which would be hard
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	628 # to do since _fileio.c is written in C).
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	629
50002 5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	630 def __init__(self, name, mode="r", closefd=True):
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	631 _fileio._FileIO.__init__(self, name, mode, closefd)
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	632 self._name = name
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	633
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	634 def close(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	635 _fileio._FileIO.close(self)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	636 RawIOBase.close(self)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	637
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	638 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	639 def name(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	640 return self._name
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	641
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	642
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	643 class BufferedIOBase(IOBase):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	644
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	645 """Base class for buffered IO objects.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	646
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	647 The main difference with RawIOBase is that the read() method
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	648 supports omitting the size argument, and does not have a default
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	649 implementation that defers to readinto().
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	650
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	651 In addition, read(), readinto() and write() may raise
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	652 BlockingIOError if the underlying raw stream is in non-blocking
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	653 mode and not ready; unlike their raw counterparts, they will never
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	654 return None.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	655
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	656 A typical implementation should not inherit from a RawIOBase
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	657 implementation, but wrap one.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	658 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	659
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	660 def read(self, n = None):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	661 """Read and return up to n bytes.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	662
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	663 If the argument is omitted, None, or negative, reads and
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	664 returns all data until EOF.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	665
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	666 If the argument is positive, and the underlying raw stream is
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	667 not 'interactive', multiple raw reads may be issued to satisfy
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	668 the byte count (unless EOF is reached first). But for
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	669 interactive raw streams (XXX and for pipes?), at most one raw
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	670 read will be issued, and a short result does not imply that
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	671 EOF is imminent.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	672
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	673 Returns an empty bytes array on EOF.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	674
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	675 Raises BlockingIOError if the underlying raw stream has no
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	676 data at the moment.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	677 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	678 self._unsupported("read")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	679
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	680 def readinto(self, b):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	681 """Read up to len(b) bytes into b.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	682
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	683 Like read(), this may issue multiple reads to the underlying raw
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	684 stream, unless the latter is 'interactive'.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	685
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	686 Returns the number of bytes read (0 for EOF).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	687
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	688 Raises BlockingIOError if the underlying raw stream has no
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	689 data at the moment.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	690 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	691 # XXX This ought to work with anything that supports the buffer API
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	692 data = self.read(len(b))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	693 n = len(data)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	694 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	695 b[:n] = data
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	696 except TypeError as err:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	697 import array
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	698 if not isinstance(b, array.array):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	699 raise err
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	700 b[:n] = array.array(b'b', data)
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	701 return n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	702
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	703 def write(self, b):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	704 """Write the given buffer to the IO stream.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	705
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	706 Return the number of bytes written, which is never less than
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	707 len(b).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	708
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	709 Raises BlockingIOError if the buffer is full and the
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	710 underlying raw stream cannot accept more data at the moment.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	711 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	712 self._unsupported("write")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	713
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	714
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	715 class _BufferedIOMixin(BufferedIOBase):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	716
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	717 """A mixin implementation of BufferedIOBase with an underlying raw stream.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	718
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	719 This passes most requests on to the underlying raw stream. It
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	720 does not provide implementations of read(), readinto() or
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	721 write().
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	722 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	723
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	724 def __init__(self, raw):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	725 self.raw = raw
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	726
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	727 ### Positioning ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	728
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	729 def seek(self, pos, whence=0):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	730 return self.raw.seek(pos, whence)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	731
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	732 def tell(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	733 return self.raw.tell()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	734
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	735 def truncate(self, pos=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	736 # Flush the stream. We're mixing buffered I/O with lower-level I/O,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	737 # and a flush may be necessary to synch both views of the current
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	738 # file state.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	739 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	740
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	741 if pos is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	742 pos = self.tell()
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	743 # XXX: Should seek() be used, instead of passing the position
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	744 # XXX directly to truncate?
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	745 return self.raw.truncate(pos)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	746
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	747 ### Flush and close ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	748
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	749 def flush(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	750 self.raw.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	751
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	752 def close(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	753 if not self.closed:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	754 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	755 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	756 except IOError:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	757 pass # If flush() fails, just give up
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	758 self.raw.close()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	759
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	760 ### Inquiries ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	761
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	762 def seekable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	763 return self.raw.seekable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	764
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	765 def readable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	766 return self.raw.readable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	767
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	768 def writable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	769 return self.raw.writable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	770
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	771 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	772 def closed(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	773 return self.raw.closed
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	774
50002 5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	775 @property
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	776 def name(self):
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	777 return self.raw.name
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	778
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	779 @property
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	780 def mode(self):
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	781 return self.raw.mode
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	782
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	783 ### Lower-level APIs ###
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	784
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	785 def fileno(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	786 return self.raw.fileno()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	787
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	788 def isatty(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	789 return self.raw.isatty()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	790
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	791
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	792 class _BytesIO(BufferedIOBase):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	793
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	794 """Buffered I/O implementation using an in-memory bytes buffer."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	795
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	796 # XXX More docs
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	797
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	798 def __init__(self, initial_bytes=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	799 buf = bytearray()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	800 if initial_bytes is not None:
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	801 buf += bytearray(initial_bytes)
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	802 self._buffer = buf
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	803 self._pos = 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	804
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	805 def getvalue(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	806 """Return the bytes value (contents) of the buffer
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	807 """
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	808 if self.closed:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	809 raise ValueError("getvalue on closed file")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	810 return bytes(self._buffer)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	811
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	812 def read(self, n=None):
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	813 if self.closed:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	814 raise ValueError("read from closed file")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	815 if n is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	816 n = -1
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	817 if not isinstance(n, (int, long)):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	818 raise TypeError("argument must be an integer")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	819 if n < 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	820 n = len(self._buffer)
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	821 if len(self._buffer) <= self._pos:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	822 return b""
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	823 newpos = min(len(self._buffer), self._pos + n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	824 b = self._buffer[self._pos : newpos]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	825 self._pos = newpos
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	826 return bytes(b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	827
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	828 def read1(self, n):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	829 """this is the same as read.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	830 """
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	831 return self.read(n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	832
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	833 def write(self, b):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	834 if self.closed:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	835 raise ValueError("write to closed file")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	836 if isinstance(b, unicode):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	837 raise TypeError("can't write unicode to binary stream")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	838 n = len(b)
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	839 if n == 0:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	840 return 0
46834 763d72d00025 Cleaned up io._BytesIO.write(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 46805 diff changeset	841 pos = self._pos
763d72d00025 Cleaned up io._BytesIO.write(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 46805 diff changeset	842 if pos > len(self._buffer):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	843 # Inserts null bytes between the current end of the file
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	844 # and the new write position.
46834 763d72d00025 Cleaned up io._BytesIO.write(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 46805 diff changeset	845 padding = b'\x00' * (pos - len(self._buffer))
763d72d00025 Cleaned up io._BytesIO.write(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 46805 diff changeset	846 self._buffer += padding
763d72d00025 Cleaned up io._BytesIO.write(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 46805 diff changeset	847 self._buffer[pos:pos + n] = b
763d72d00025 Cleaned up io._BytesIO.write(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 46805 diff changeset	848 self._pos += n
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	849 return n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	850
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	851 def seek(self, pos, whence=0):
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	852 if self.closed:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	853 raise ValueError("seek on closed file")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	854 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	855 pos = pos.__index__()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	856 except AttributeError as err:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	857 raise TypeError("an integer is required") # from err
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	858 if whence == 0:
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	859 if pos < 0:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	860 raise ValueError("negative seek position %r" % (pos,))
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	861 self._pos = pos
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	862 elif whence == 1:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	863 self._pos = max(0, self._pos + pos)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	864 elif whence == 2:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	865 self._pos = max(0, len(self._buffer) + pos)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	866 else:
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	867 raise ValueError("invalid whence value")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	868 return self._pos
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	869
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	870 def tell(self):
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	871 if self.closed:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	872 raise ValueError("tell on closed file")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	873 return self._pos
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	874
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	875 def truncate(self, pos=None):
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	876 if self.closed:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	877 raise ValueError("truncate on closed file")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	878 if pos is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	879 pos = self._pos
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	880 elif pos < 0:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	881 raise ValueError("negative truncate position %r" % (pos,))
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	882 del self._buffer[pos:]
58544 0bd616dfc977 Issue #6939: Fix file I/O objects in the `io` module to keep the original Antoine Pitrou <solipsis@pitrou.net> parents: 57788 diff changeset	883 return pos
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	884
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	885 def readable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	886 return True
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	887
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	888 def writable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	889 return True
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	890
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	891 def seekable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	892 return True
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	893
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	894 # Use the faster implementation of BytesIO if available
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	895 try:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	896 import _bytesio
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	897
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	898 class BytesIO(_bytesio._BytesIO, BufferedIOBase):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	899 __doc__ = _bytesio._BytesIO.__doc__
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	900
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	901 except ImportError:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	902 BytesIO = _BytesIO
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	903
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	904
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	905 class BufferedReader(_BufferedIOMixin):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	906
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	907 """BufferedReader(raw[, buffer_size])
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	908
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	909 A buffer for a readable, sequential BaseRawIO object.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	910
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	911 The constructor creates a BufferedReader for the given readable raw
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	912 stream and buffer_size. If buffer_size is omitted, DEFAULT_BUFFER_SIZE
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	913 is used.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	914 """
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	915
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	916 def __init__(self, raw, buffer_size=DEFAULT_BUFFER_SIZE):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	917 """Create a new buffered reader using the given readable raw IO object.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	918 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	919 raw._checkReadable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	920 _BufferedIOMixin.__init__(self, raw)
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	921 self.buffer_size = buffer_size
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	922 self._reset_read_buf()
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	923 self._read_lock = threading.Lock()
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	924
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	925 def _reset_read_buf(self):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	926 self._read_buf = b""
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	927 self._read_pos = 0
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	928
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	929 def read(self, n=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	930 """Read n bytes.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	931
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	932 Returns exactly n bytes of data unless the underlying raw IO
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	933 stream reaches EOF or if the call would block in non-blocking
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	934 mode. If n is negative, read until EOF or until read() would
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	935 block.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	936 """
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	937 with self._read_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	938 return self._read_unlocked(n)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	939
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	940 def _read_unlocked(self, n=None):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	941 nodata_val = b""
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	942 empty_values = (b"", None)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	943 buf = self._read_buf
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	944 pos = self._read_pos
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	945
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	946 # Special case for when the number of bytes to read is unspecified.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	947 if n is None or n == -1:
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	948 self._reset_read_buf()
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	949 chunks = [buf[pos:]] # Strip the consumed bytes.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	950 current_size = 0
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	951 while True:
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	952 # Read until EOF or until read() would block.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	953 chunk = self.raw.read()
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	954 if chunk in empty_values:
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	955 nodata_val = chunk
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	956 break
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	957 current_size += len(chunk)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	958 chunks.append(chunk)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	959 return b"".join(chunks) or nodata_val
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	960
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	961 # The number of bytes to read is specified, return at most n bytes.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	962 avail = len(buf) - pos # Length of the available buffered data.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	963 if n <= avail:
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	964 # Fast path: the data to read is fully buffered.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	965 self._read_pos += n
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	966 return buf[pos:pos+n]
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	967 # Slow path: read from the stream until enough bytes are read,
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	968 # or until an EOF occurs or until read() would block.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	969 chunks = [buf[pos:]]
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	970 wanted = max(self.buffer_size, n)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	971 while avail < n:
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	972 chunk = self.raw.read(wanted)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	973 if chunk in empty_values:
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	974 nodata_val = chunk
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	975 break
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	976 avail += len(chunk)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	977 chunks.append(chunk)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	978 # n is more then avail only when an EOF occurred or when
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	979 # read() would have blocked.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	980 n = min(n, avail)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	981 out = b"".join(chunks)
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	982 self._read_buf = out[n:] # Save the extra data in the buffer.
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	983 self._read_pos = 0
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	984 return out[:n] if out else nodata_val
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	985
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	986 def peek(self, n=0):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	987 """Returns buffered bytes without advancing the position.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	988
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	989 The argument indicates a desired minimal number of bytes; we
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	990 do at most one raw read to satisfy it. We never return more
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	991 than self.buffer_size.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	992 """
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	993 with self._read_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	994 return self._peek_unlocked(n)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	995
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	996 def _peek_unlocked(self, n=0):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	997 want = min(n, self.buffer_size)
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	998 have = len(self._read_buf) - self._read_pos
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	999 if have < want:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1000 to_read = self.buffer_size - have
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1001 current = self.raw.read(to_read)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1002 if current:
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	1003 self._read_buf = self._read_buf[self._read_pos:] + current
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	1004 self._read_pos = 0
8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	1005 return self._read_buf[self._read_pos:]
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1006
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1007 def read1(self, n):
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1008 """Reads up to n bytes, with at most one read() system call."""
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1009 # Returns up to n bytes. If at least one byte is buffered, we
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1010 # only return buffered bytes. Otherwise, we do one raw read.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1011 if n <= 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1012 return b""
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1013 with self._read_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1014 self._peek_unlocked(1)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1015 return self._read_unlocked(
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1016 min(n, len(self._read_buf) - self._read_pos))
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1017
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1018 def tell(self):
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	1019 return self.raw.tell() - len(self._read_buf) + self._read_pos
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1020
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1021 def seek(self, pos, whence=0):
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1022 with self._read_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1023 if whence == 1:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1024 pos -= len(self._read_buf) - self._read_pos
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1025 pos = self.raw.seek(pos, whence)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1026 self._reset_read_buf()
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1027 return pos
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1028
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1029
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1030 class BufferedWriter(_BufferedIOMixin):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1031
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1032 """A buffer for a writeable sequential RawIO object.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1033
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1034 The constructor creates a BufferedWriter for the given writeable raw
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1035 stream. If the buffer_size is not given, it defaults to
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1036 DEAFULT_BUFFER_SIZE. If max_buffer_size is omitted, it defaults to
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1037 twice the buffer size.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1038 """
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1039
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1040 def __init__(self, raw,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1041 buffer_size=DEFAULT_BUFFER_SIZE, max_buffer_size=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1042 raw._checkWritable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1043 _BufferedIOMixin.__init__(self, raw)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1044 self.buffer_size = buffer_size
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1045 self.max_buffer_size = (2*buffer_size
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1046 if max_buffer_size is None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1047 else max_buffer_size)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1048 self._write_buf = bytearray()
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1049 self._write_lock = threading.Lock()
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1050
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1051 def write(self, b):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1052 if self.closed:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1053 raise ValueError("write to closed file")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1054 if isinstance(b, unicode):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1055 raise TypeError("can't write unicode to binary stream")
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1056 with self._write_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1057 # XXX we can implement some more tricks to try and avoid
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1058 # partial writes
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1059 if len(self._write_buf) > self.buffer_size:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1060 # We're full, so let's pre-flush the buffer
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1061 try:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1062 self._flush_unlocked()
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1063 except BlockingIOError as e:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1064 # We can't accept anything else.
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1065 # XXX Why not just let the exception pass through?
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1066 raise BlockingIOError(e.errno, e.strerror, 0)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1067 before = len(self._write_buf)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1068 self._write_buf.extend(b)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1069 written = len(self._write_buf) - before
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1070 if len(self._write_buf) > self.buffer_size:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1071 try:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1072 self._flush_unlocked()
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1073 except BlockingIOError as e:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1074 if len(self._write_buf) > self.max_buffer_size:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1075 # We've hit max_buffer_size. We have to accept a
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1076 # partial write and cut back our buffer.
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1077 overage = len(self._write_buf) - self.max_buffer_size
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1078 self._write_buf = self._write_buf[:self.max_buffer_size]
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1079 raise BlockingIOError(e.errno, e.strerror, overage)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1080 return written
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1081
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1082 def truncate(self, pos=None):
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1083 with self._write_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1084 self._flush_unlocked()
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1085 if pos is None:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1086 pos = self.raw.tell()
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1087 return self.raw.truncate(pos)
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1088
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1089 def flush(self):
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1090 with self._write_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1091 self._flush_unlocked()
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1092
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1093 def _flush_unlocked(self):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1094 if self.closed:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1095 raise ValueError("flush of closed file")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1096 written = 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1097 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1098 while self._write_buf:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1099 n = self.raw.write(self._write_buf)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1100 del self._write_buf[:n]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1101 written += n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1102 except BlockingIOError as e:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1103 n = e.characters_written
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1104 del self._write_buf[:n]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1105 written += n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1106 raise BlockingIOError(e.errno, e.strerror, written)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1107
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1108 def tell(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1109 return self.raw.tell() + len(self._write_buf)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1110
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1111 def seek(self, pos, whence=0):
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1112 with self._write_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1113 self._flush_unlocked()
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1114 return self.raw.seek(pos, whence)
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1115
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1116
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1117 class BufferedRWPair(BufferedIOBase):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1118
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1119 """A buffered reader and writer object together.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1120
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1121 A buffered reader object and buffered writer object put together to
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1122 form a sequential IO object that can read and write. This is typically
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1123 used with a socket or two-way pipe.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1124
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1125 reader and writer are RawIOBase objects that are readable and
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1126 writeable respectively. If the buffer_size is omitted it defaults to
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1127 DEFAULT_BUFFER_SIZE. The max_buffer_size (for the buffered writer)
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1128 defaults to twice the buffer size.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1129 """
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1130
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1131 # XXX The usefulness of this (compared to having two separate IO
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1132 # objects) is questionable.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1133
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1134 def __init__(self, reader, writer,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1135 buffer_size=DEFAULT_BUFFER_SIZE, max_buffer_size=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1136 """Constructor.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1137
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1138 The arguments are two RawIO instances.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1139 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1140 reader._checkReadable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1141 writer._checkWritable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1142 self.reader = BufferedReader(reader, buffer_size)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1143 self.writer = BufferedWriter(writer, buffer_size, max_buffer_size)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1144
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1145 def read(self, n=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1146 if n is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1147 n = -1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1148 return self.reader.read(n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1149
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1150 def readinto(self, b):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1151 return self.reader.readinto(b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1152
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1153 def write(self, b):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1154 return self.writer.write(b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1155
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1156 def peek(self, n=0):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1157 return self.reader.peek(n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1158
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1159 def read1(self, n):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1160 return self.reader.read1(n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1161
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1162 def readable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1163 return self.reader.readable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1164
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1165 def writable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1166 return self.writer.writable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1167
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1168 def flush(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1169 return self.writer.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1170
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1171 def close(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1172 self.writer.close()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1173 self.reader.close()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1174
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1175 def isatty(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1176 return self.reader.isatty() or self.writer.isatty()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1177
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1178 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1179 def closed(self):
50305 e673632e1885 Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50171 diff changeset	1180 return self.writer.closed
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1181
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1182
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1183 class BufferedRandom(BufferedWriter, BufferedReader):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1184
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1185 """A buffered interface to random access streams.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1186
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1187 The constructor creates a reader and writer for a seekable stream,
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1188 raw, given in the first argument. If the buffer_size is omitted it
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1189 defaults to DEFAULT_BUFFER_SIZE. The max_buffer_size (for the buffered
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1190 writer) defaults to twice the buffer size.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1191 """
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1192
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1193 def __init__(self, raw,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1194 buffer_size=DEFAULT_BUFFER_SIZE, max_buffer_size=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1195 raw._checkSeekable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1196 BufferedReader.__init__(self, raw, buffer_size)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1197 BufferedWriter.__init__(self, raw, buffer_size, max_buffer_size)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1198
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1199 def seek(self, pos, whence=0):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1200 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1201 # First do the raw seek, then empty the read buffer, so that
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1202 # if the raw seek fails, we don't lose buffered data forever.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1203 pos = self.raw.seek(pos, whence)
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1204 with self._read_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1205 self._reset_read_buf()
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1206 return pos
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1207
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1208 def tell(self):
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	1209 if self._write_buf:
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1210 return self.raw.tell() + len(self._write_buf)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1211 else:
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	1212 return BufferedReader.tell(self)
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1213
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1214 def truncate(self, pos=None):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1215 if pos is None:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1216 pos = self.tell()
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1217 # Use seek to flush the read buffer.
58544 0bd616dfc977 Issue #6939: Fix file I/O objects in the `io` module to keep the original Antoine Pitrou <solipsis@pitrou.net> parents: 57788 diff changeset	1218 return BufferedWriter.truncate(self, pos)
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1219
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1220 def read(self, n=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1221 if n is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1222 n = -1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1223 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1224 return BufferedReader.read(self, n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1225
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1226 def readinto(self, b):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1227 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1228 return BufferedReader.readinto(self, b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1229
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1230 def peek(self, n=0):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1231 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1232 return BufferedReader.peek(self, n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1233
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1234 def read1(self, n):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1235 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1236 return BufferedReader.read1(self, n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1237
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1238 def write(self, b):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1239 if self._read_buf:
48093 8afc4e2c4c02 backport r65264 Benjamin Peterson <benjamin@python.org> parents: 46834 diff changeset	1240 # Undo readahead
48238 67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1241 with self._read_lock:
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1242 self.raw.seek(self._read_pos - len(self._read_buf), 1)
67938575afc6 Issue #3476: make BufferedReader and BufferedWriter thread-safe Antoine Pitrou <solipsis@pitrou.net> parents: 48093 diff changeset	1243 self._reset_read_buf()
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1244 return BufferedWriter.write(self, b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1245
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1246
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1247 class TextIOBase(IOBase):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1248
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1249 """Base class for text I/O.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1250
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1251 This class provides a character and line based interface to stream
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1252 I/O. There is no readinto method because Python's character strings
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1253 are immutable. There is no public constructor.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1254 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1255
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1256 def read(self, n = -1):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1257 """Read at most n characters from stream.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1258
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1259 Read from underlying buffer until we have n characters or we hit EOF.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1260 If n is negative or omitted, read until EOF.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1261 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1262 self._unsupported("read")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1263
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1264 def write(self, s):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1265 """Write string s to stream."""
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1266 self._unsupported("write")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1267
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1268 def truncate(self, pos = None):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1269 """Truncate size to pos."""
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1270 self._unsupported("truncate")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1271
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1272 def readline(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1273 """Read until newline or EOF.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1274
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1275 Returns an empty string if EOF is hit immediately.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1276 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1277 self._unsupported("readline")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1278
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1279 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1280 def encoding(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1281 """Subclasses should override."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1282 return None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1283
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1284 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1285 def newlines(self):
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1286 """Line endings translated so far.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1287
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1288 Only line endings translated during reading are considered.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1289
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1290 Subclasses should override.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1291 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1292 return None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1293
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1294
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1295 class IncrementalNewlineDecoder(codecs.IncrementalDecoder):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1296 """Codec used when reading a file in universal newlines mode.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1297 It wraps another incremental decoder, translating \\r\\n and \\r into \\n.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1298 It also records the types of newlines encountered.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1299 When used with translate=False, it ensures that the newline sequence is
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1300 returned in one piece.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1301 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1302 def __init__(self, decoder, translate, errors='strict'):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1303 codecs.IncrementalDecoder.__init__(self, errors=errors)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1304 self.translate = translate
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1305 self.decoder = decoder
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1306 self.seennl = 0
50171 d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1307 self.pendingcr = False
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1308
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1309 def decode(self, input, final=False):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1310 # decode input (with the eventual \r from a previous pass)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1311 output = self.decoder.decode(input, final=final)
50171 d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1312 if self.pendingcr and (output or final):
d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1313 output = "\r" + output
d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1314 self.pendingcr = False
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1315
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1316 # retain last \r even when not translating data:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1317 # then readline() is sure to get \r\n in one pass
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1318 if output.endswith("\r") and not final:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1319 output = output[:-1]
50171 d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1320 self.pendingcr = True
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1321
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1322 # Record which newlines are read
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1323 crlf = output.count('\r\n')
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1324 cr = output.count('\r') - crlf
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1325 lf = output.count('\n') - crlf
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1326 self.seennl \|= (lf and self._LF) \| (cr and self._CR) \
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1327 \| (crlf and self._CRLF)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1328
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1329 if self.translate:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1330 if crlf:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1331 output = output.replace("\r\n", "\n")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1332 if cr:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1333 output = output.replace("\r", "\n")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1334
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1335 return output
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1336
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1337 def getstate(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1338 buf, flag = self.decoder.getstate()
50171 d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1339 flag <<= 1
d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1340 if self.pendingcr:
d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1341 flag \|= 1
d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1342 return buf, flag
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1343
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1344 def setstate(self, state):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1345 buf, flag = state
50171 d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1346 self.pendingcr = bool(flag & 1)
d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1347 self.decoder.setstate((buf, flag >> 1))
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1348
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1349 def reset(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1350 self.seennl = 0
50171 d15746abf6c7 Merged revisions 67762 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 50002 diff changeset	1351 self.pendingcr = False
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1352 self.decoder.reset()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1353
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1354 _LF = 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1355 _CR = 2
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1356 _CRLF = 4
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1357
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1358 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1359 def newlines(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1360 return (None,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1361 "\n",
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1362 "\r",
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1363 ("\r", "\n"),
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1364 "\r\n",
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1365 ("\n", "\r\n"),
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1366 ("\r", "\r\n"),
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1367 ("\r", "\n", "\r\n")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1368 )[self.seennl]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1369
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1370
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1371 class TextIOWrapper(TextIOBase):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1372
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1373 r"""Character and line based layer over a BufferedIOBase object, buffer.
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1374
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1375 encoding gives the name of the encoding that the stream will be
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1376 decoded or encoded with. It defaults to locale.getpreferredencoding.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1377
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1378 errors determines the strictness of encoding and decoding (see the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1379 codecs.register) and defaults to "strict".
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1380
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1381 newline can be None, '', '\n', '\r', or '\r\n'. It controls the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1382 handling of line endings. If it is None, universal newlines is
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1383 enabled. With this enabled, on input, the lines endings '\n', '\r',
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1384 or '\r\n' are translated to '\n' before being returned to the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1385 caller. Conversely, on output, '\n' is translated to the system
55049 74c0a78114ae Merged revisions 69846 via svnmerge from Jesus Cea <jcea@jcea.es> parents: 54722 diff changeset	1386 default line separator, os.linesep. If newline is any other of its
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1387 legal values, that newline becomes the newline when the file is read
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1388 and it is returned untranslated. On output, '\n' is converted to the
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1389 newline.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1390
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1391 If line_buffering is True, a call to flush is implied when a call to
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1392 write contains a newline character.
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1393 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1394
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1395 _CHUNK_SIZE = 128
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1396
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1397 def __init__(self, buffer, encoding=None, errors=None, newline=None,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1398 line_buffering=False):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1399 if newline not in (None, "", "\n", "\r", "\r\n"):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1400 raise ValueError("illegal newline value: %r" % (newline,))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1401 if encoding is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1402 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1403 encoding = os.device_encoding(buffer.fileno())
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1404 except (AttributeError, UnsupportedOperation):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1405 pass
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1406 if encoding is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1407 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1408 import locale
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1409 except ImportError:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1410 # Importing locale may fail if Python is being built
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1411 encoding = "ascii"
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1412 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1413 encoding = locale.getpreferredencoding()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1414
46124 38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	1415 if not isinstance(encoding, basestring):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1416 raise ValueError("invalid encoding: %r" % encoding)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1417
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1418 if errors is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1419 errors = "strict"
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1420 else:
46124 38fe64e3b131 Use the new unicode literals for the io module Christian Heimes <christian@cheimes.de> parents: 46107 diff changeset	1421 if not isinstance(errors, basestring):
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1422 raise ValueError("invalid errors: %r" % errors)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1423
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1424 self.buffer = buffer
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1425 self._line_buffering = line_buffering
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1426 self._encoding = encoding
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1427 self._errors = errors
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1428 self._readuniversal = not newline
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1429 self._readtranslate = newline is None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1430 self._readnl = newline
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1431 self._writetranslate = newline != ''
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1432 self._writenl = newline or os.linesep
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1433 self._encoder = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1434 self._decoder = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1435 self._decoded_chars = '' # buffer for text returned from decoder
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1436 self._decoded_chars_used = 0 # offset into _decoded_chars for read()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1437 self._snapshot = None # info for reconstructing decoder state
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1438 self._seekable = self._telling = self.buffer.seekable()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1439
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1440 # self._snapshot is either None, or a tuple (dec_flags, next_input)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1441 # where dec_flags is the second (integer) item of the decoder state
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1442 # and next_input is the chunk of input bytes that comes next after the
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1443 # snapshot point. We use this to reconstruct decoder states in tell().
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1444
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1445 # Naming convention:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1446 # - "bytes_..." for integer variables that count input bytes
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1447 # - "chars_..." for integer variables that count decoded characters
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1448
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1449 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1450 def encoding(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1451 return self._encoding
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1452
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1453 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1454 def errors(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1455 return self._errors
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1456
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1457 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1458 def line_buffering(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1459 return self._line_buffering
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1460
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1461 def seekable(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1462 return self._seekable
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1463
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1464 def readable(self):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1465 return self.buffer.readable()
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1466
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1467 def writable(self):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1468 return self.buffer.writable()
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1469
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1470 def flush(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1471 self.buffer.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1472 self._telling = self._seekable
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1473
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1474 def close(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1475 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1476 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1477 except:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1478 pass # If flush() fails, just give up
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1479 self.buffer.close()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1480
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1481 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1482 def closed(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1483 return self.buffer.closed
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1484
50002 5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	1485 @property
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	1486 def name(self):
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	1487 return self.buffer.name
5ef8b5a74efa Merged revisions 67245,67277,67289,67295,67301-67303,67307,67330,67332,67336,67355,67359,67362,67364,67367-67368,67370 via svnmerge from Georg Brandl <georg@python.org> parents: 48276 diff changeset	1488
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1489 def fileno(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1490 return self.buffer.fileno()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1491
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1492 def isatty(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1493 return self.buffer.isatty()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1494
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1495 def write(self, s):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1496 if self.closed:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1497 raise ValueError("write to closed file")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1498 if not isinstance(s, unicode):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1499 raise TypeError("can't write %s to text stream" %
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1500 s.__class__.__name__)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1501 length = len(s)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1502 haslf = (self._writetranslate or self._line_buffering) and "\n" in s
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1503 if haslf and self._writetranslate and self._writenl != "\n":
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1504 s = s.replace("\n", self._writenl)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1505 encoder = self._encoder or self._get_encoder()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1506 # XXX What if we were just reading?
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1507 b = encoder.encode(s)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1508 self.buffer.write(b)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1509 if self._line_buffering and (haslf or "\r" in s):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1510 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1511 self._snapshot = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1512 if self._decoder:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1513 self._decoder.reset()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1514 return length
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1515
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1516 def _get_encoder(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1517 make_encoder = codecs.getincrementalencoder(self._encoding)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1518 self._encoder = make_encoder(self._errors)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1519 return self._encoder
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1520
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1521 def _get_decoder(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1522 make_decoder = codecs.getincrementaldecoder(self._encoding)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1523 decoder = make_decoder(self._errors)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1524 if self._readuniversal:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1525 decoder = IncrementalNewlineDecoder(decoder, self._readtranslate)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1526 self._decoder = decoder
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1527 return decoder
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1528
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1529 # The following three methods implement an ADT for _decoded_chars.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1530 # Text returned from the decoder is buffered here until the client
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1531 # requests it by calling our read() or readline() method.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1532 def _set_decoded_chars(self, chars):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1533 """Set the _decoded_chars buffer."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1534 self._decoded_chars = chars
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1535 self._decoded_chars_used = 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1536
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1537 def _get_decoded_chars(self, n=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1538 """Advance into the _decoded_chars buffer."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1539 offset = self._decoded_chars_used
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1540 if n is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1541 chars = self._decoded_chars[offset:]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1542 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1543 chars = self._decoded_chars[offset:offset + n]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1544 self._decoded_chars_used += len(chars)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1545 return chars
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1546
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1547 def _rewind_decoded_chars(self, n):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1548 """Rewind the _decoded_chars buffer."""
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1549 if self._decoded_chars_used < n:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1550 raise AssertionError("rewind decoded_chars out of bounds")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1551 self._decoded_chars_used -= n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1552
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1553 def _read_chunk(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1554 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1555 Read and decode the next chunk of data from the BufferedReader.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1556
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1557 The return value is True unless EOF was reached. The decoded string
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1558 is placed in self._decoded_chars (replacing its previous value).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1559 The entire input chunk is sent to the decoder, though some of it
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1560 may remain buffered in the decoder, yet to be converted.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1561 """
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1562
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1563 if self._decoder is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1564 raise ValueError("no decoder")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1565
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1566 if self._telling:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1567 # To prepare for tell(), we need to snapshot a point in the
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1568 # file where the decoder's input buffer is empty.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1569
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1570 dec_buffer, dec_flags = self._decoder.getstate()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1571 # Given this, we know there was a valid snapshot point
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1572 # len(dec_buffer) bytes ago with decoder state (b'', dec_flags).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1573
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1574 # Read a chunk, decode it, and put the result in self._decoded_chars.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1575 input_chunk = self.buffer.read1(self._CHUNK_SIZE)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1576 eof = not input_chunk
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1577 self._set_decoded_chars(self._decoder.decode(input_chunk, eof))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1578
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1579 if self._telling:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1580 # At the snapshot point, len(dec_buffer) bytes before the read,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1581 # the next input to be decoded is dec_buffer + input_chunk.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1582 self._snapshot = (dec_flags, dec_buffer + input_chunk)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1583
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1584 return not eof
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1585
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1586 def _pack_cookie(self, position, dec_flags=0,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1587 bytes_to_feed=0, need_eof=0, chars_to_skip=0):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1588 # The meaning of a tell() cookie is: seek to position, set the
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1589 # decoder flags to dec_flags, read bytes_to_feed bytes, feed them
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1590 # into the decoder with need_eof as the EOF flag, then skip
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1591 # chars_to_skip characters of the decoded result. For most simple
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1592 # decoders, tell() will often just give a byte offset in the file.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1593 return (position \| (dec_flags<<64) \| (bytes_to_feed<<128) \|
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1594 (chars_to_skip<<192) \| bool(need_eof)<<256)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1595
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1596 def _unpack_cookie(self, bigint):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1597 rest, position = divmod(bigint, 1<<64)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1598 rest, dec_flags = divmod(rest, 1<<64)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1599 rest, bytes_to_feed = divmod(rest, 1<<64)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1600 need_eof, chars_to_skip = divmod(rest, 1<<64)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1601 return position, dec_flags, bytes_to_feed, need_eof, chars_to_skip
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1602
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1603 def tell(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1604 if not self._seekable:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1605 raise IOError("underlying stream is not seekable")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1606 if not self._telling:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1607 raise IOError("telling position disabled by next() call")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1608 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1609 position = self.buffer.tell()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1610 decoder = self._decoder
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1611 if decoder is None or self._snapshot is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1612 if self._decoded_chars:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1613 # This should never happen.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1614 raise AssertionError("pending decoded text")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1615 return position
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1616
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1617 # Skip backward to the snapshot point (see _read_chunk).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1618 dec_flags, next_input = self._snapshot
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1619 position -= len(next_input)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1620
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1621 # How many decoded characters have been used up since the snapshot?
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1622 chars_to_skip = self._decoded_chars_used
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1623 if chars_to_skip == 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1624 # We haven't moved from the snapshot point.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1625 return self._pack_cookie(position, dec_flags)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1626
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1627 # Starting from the snapshot position, we will walk the decoder
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1628 # forward until it gives us enough decoded characters.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1629 saved_state = decoder.getstate()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1630 try:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1631 # Note our initial start point.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1632 decoder.setstate((b'', dec_flags))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1633 start_pos = position
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1634 start_flags, bytes_fed, chars_decoded = dec_flags, 0, 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1635 need_eof = 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1636
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1637 # Feed the decoder one byte at a time. As we go, note the
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1638 # nearest "safe start point" before the current location
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1639 # (a point where the decoder has nothing buffered, so seek()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1640 # can safely start from there and advance to this location).
46641 bfa82b493335 In test_io, StatefulIncrementalDecoderTest was not part of the test suite. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46421 diff changeset	1641 for next_byte in next_input:
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1642 bytes_fed += 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1643 chars_decoded += len(decoder.decode(next_byte))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1644 dec_buffer, dec_flags = decoder.getstate()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1645 if not dec_buffer and chars_decoded <= chars_to_skip:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1646 # Decoder buffer is empty, so this is a safe start point.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1647 start_pos += bytes_fed
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1648 chars_to_skip -= chars_decoded
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1649 start_flags, bytes_fed, chars_decoded = dec_flags, 0, 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1650 if chars_decoded >= chars_to_skip:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1651 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1652 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1653 # We didn't get enough decoded data; signal EOF to get more.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1654 chars_decoded += len(decoder.decode(b'', final=True))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1655 need_eof = 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1656 if chars_decoded < chars_to_skip:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1657 raise IOError("can't reconstruct logical file position")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1658
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1659 # The returned cookie corresponds to the last safe start point.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1660 return self._pack_cookie(
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1661 start_pos, start_flags, bytes_fed, need_eof, chars_to_skip)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1662 finally:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1663 decoder.setstate(saved_state)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1664
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1665 def truncate(self, pos=None):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1666 self.flush()
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1667 if pos is None:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1668 pos = self.tell()
58544 0bd616dfc977 Issue #6939: Fix file I/O objects in the `io` module to keep the original Antoine Pitrou <solipsis@pitrou.net> parents: 57788 diff changeset	1669 return self.buffer.truncate(pos)
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1670
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1671 def seek(self, cookie, whence=0):
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1672 if self.closed:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1673 raise ValueError("tell on closed file")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1674 if not self._seekable:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1675 raise IOError("underlying stream is not seekable")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1676 if whence == 1: # seek relative to current position
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1677 if cookie != 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1678 raise IOError("can't do nonzero cur-relative seeks")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1679 # Seeking to the current position should attempt to
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1680 # sync the underlying buffer with the current position.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1681 whence = 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1682 cookie = self.tell()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1683 if whence == 2: # seek relative to end of file
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1684 if cookie != 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1685 raise IOError("can't do nonzero end-relative seeks")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1686 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1687 position = self.buffer.seek(0, 2)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1688 self._set_decoded_chars('')
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1689 self._snapshot = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1690 if self._decoder:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1691 self._decoder.reset()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1692 return position
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1693 if whence != 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1694 raise ValueError("invalid whence (%r, should be 0, 1 or 2)" %
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1695 (whence,))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1696 if cookie < 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1697 raise ValueError("negative seek position %r" % (cookie,))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1698 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1699
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1700 # The strategy of seek() is to go back to the safe start point
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1701 # and replay the effect of read(chars_to_skip) from there.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1702 start_pos, dec_flags, bytes_to_feed, need_eof, chars_to_skip = \
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1703 self._unpack_cookie(cookie)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1704
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1705 # Seek back to the safe start point.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1706 self.buffer.seek(start_pos)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1707 self._set_decoded_chars('')
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1708 self._snapshot = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1709
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1710 # Restore the decoder to its state from the safe start point.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1711 if self._decoder or dec_flags or chars_to_skip:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1712 self._decoder = self._decoder or self._get_decoder()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1713 self._decoder.setstate((b'', dec_flags))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1714 self._snapshot = (dec_flags, b'')
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1715
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1716 if chars_to_skip:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1717 # Just like _read_chunk, feed the decoder and save a snapshot.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1718 input_chunk = self.buffer.read(bytes_to_feed)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1719 self._set_decoded_chars(
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1720 self._decoder.decode(input_chunk, need_eof))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1721 self._snapshot = (dec_flags, input_chunk)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1722
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1723 # Skip chars_to_skip of the decoded characters.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1724 if len(self._decoded_chars) < chars_to_skip:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1725 raise IOError("can't restore logical file position")
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1726 self._decoded_chars_used = chars_to_skip
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1727
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1728 return cookie
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1729
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1730 def read(self, n=None):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1731 if n is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1732 n = -1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1733 decoder = self._decoder or self._get_decoder()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1734 if n < 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1735 # Read everything.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1736 result = (self._get_decoded_chars() +
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1737 decoder.decode(self.buffer.read(), final=True))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1738 self._set_decoded_chars('')
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1739 self._snapshot = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1740 return result
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1741 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1742 # Keep reading chunks until we have n characters to return.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1743 eof = False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1744 result = self._get_decoded_chars(n)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1745 while len(result) < n and not eof:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1746 eof = not self._read_chunk()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1747 result += self._get_decoded_chars(n - len(result))
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1748 return result
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1749
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1750 def next(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1751 self._telling = False
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1752 line = self.readline()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1753 if not line:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1754 self._snapshot = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1755 self._telling = self._seekable
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1756 raise StopIteration
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1757 return line
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1758
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1759 def readline(self, limit=None):
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1760 if self.closed:
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1761 raise ValueError("read from closed file")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1762 if limit is None:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1763 limit = -1
46805 4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1764 if not isinstance(limit, (int, long)):
4c5ee1b38045 Backport fast alternate io.BytesIO implementation. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46663 diff changeset	1765 raise TypeError("limit must be an integer")
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1766
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1767 # Grab all the decoded text (we will rewind any extra bits later).
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1768 line = self._get_decoded_chars()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1769
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1770 start = 0
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1771 decoder = self._decoder or self._get_decoder()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1772
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1773 pos = endpos = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1774 while True:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1775 if self._readtranslate:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1776 # Newlines are already translated, only search for \n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1777 pos = line.find('\n', start)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1778 if pos >= 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1779 endpos = pos + 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1780 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1781 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1782 start = len(line)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1783
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1784 elif self._readuniversal:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1785 # Universal newline search. Find any of \r, \r\n, \n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1786 # The decoder ensures that \r\n are not split in two pieces
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1787
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1788 # In C we'd look for these in parallel of course.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1789 nlpos = line.find("\n", start)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1790 crpos = line.find("\r", start)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1791 if crpos == -1:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1792 if nlpos == -1:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1793 # Nothing found
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1794 start = len(line)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1795 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1796 # Found \n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1797 endpos = nlpos + 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1798 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1799 elif nlpos == -1:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1800 # Found lone \r
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1801 endpos = crpos + 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1802 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1803 elif nlpos < crpos:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1804 # Found \n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1805 endpos = nlpos + 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1806 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1807 elif nlpos == crpos + 1:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1808 # Found \r\n
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1809 endpos = crpos + 2
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1810 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1811 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1812 # Found \r
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1813 endpos = crpos + 1
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1814 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1815 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1816 # non-universal
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1817 pos = line.find(self._readnl)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1818 if pos >= 0:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1819 endpos = pos + len(self._readnl)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1820 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1821
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1822 if limit >= 0 and len(line) >= limit:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1823 endpos = limit # reached length limit
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1824 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1825
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1826 # No line ending seen yet - get more data
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1827 more_line = ''
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1828 while self._read_chunk():
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1829 if self._decoded_chars:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1830 break
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1831 if self._decoded_chars:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1832 line += self._get_decoded_chars()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1833 else:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1834 # end of file
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1835 self._set_decoded_chars('')
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1836 self._snapshot = None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1837 return line
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1838
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1839 if limit >= 0 and endpos > limit:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1840 endpos = limit # don't exceed limit
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1841
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1842 # Rewind _decoded_chars to just after the line ending we found.
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1843 self._rewind_decoded_chars(len(line) - endpos)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1844 return line[:endpos]
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1845
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1846 @property
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1847 def newlines(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1848 return self._decoder.newlines if self._decoder else None
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1849
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1850 class StringIO(TextIOWrapper):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1851
46663 643415f91a50 Remove method signatures from the docstrings of io.py Benjamin Peterson <benjamin@python.org> parents: 46641 diff changeset	1852 """An in-memory stream for text. The initial_value argument sets the
46420 b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1853 value of object. The other arguments are like those of TextIOWrapper's
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1854 constructor.
b544bb61bca9 Backported io module docs Benjamin Peterson <benjamin@python.org> parents: 46124 diff changeset	1855 """
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1856
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1857 def __init__(self, initial_value="", encoding="utf-8",
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1858 errors="strict", newline="\n"):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1859 super(StringIO, self).__init__(BytesIO(),
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1860 encoding=encoding,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1861 errors=errors,
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1862 newline=newline)
54722 d8338a9a1e3a Fix issue #6127: Make universal newlines mode of io.StringIO not Alexandre Vassalotti <alexandre@peadrop.com> parents: 50305 diff changeset	1863 # Issue #5645: make universal newlines semantics the same as in the
d8338a9a1e3a Fix issue #6127: Make universal newlines mode of io.StringIO not Alexandre Vassalotti <alexandre@peadrop.com> parents: 50305 diff changeset	1864 # C version, even under Windows.
d8338a9a1e3a Fix issue #6127: Make universal newlines mode of io.StringIO not Alexandre Vassalotti <alexandre@peadrop.com> parents: 50305 diff changeset	1865 if newline is None:
d8338a9a1e3a Fix issue #6127: Make universal newlines mode of io.StringIO not Alexandre Vassalotti <alexandre@peadrop.com> parents: 50305 diff changeset	1866 self._writetranslate = False
46107 5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1867 if initial_value:
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1868 if not isinstance(initial_value, unicode):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1869 initial_value = unicode(initial_value)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1870 self.write(initial_value)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1871 self.seek(0)
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1872
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1873 def getvalue(self):
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1874 self.flush()
5341b30b1812 Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from Christian Heimes <christian@cheimes.de> parents: diff changeset	1875 return self.buffer.getvalue().decode(self._encoding, self._errors)

Mercurial > cpython-lru_cache-weakref

annotate Lib/io.py @ 58925:eecf1bef052d 2.6