python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-15 10:42:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4297 from radarhere/container

Browse Source 
Change ContainerIO return type to match file object mode
This commit is contained in:
Hugo van Kemenade 2020-02-15 14:29:32 +02:00 committed by GitHub
commit cc3c743c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Tests/test_file_container.py
View File

@ -20,7 +20,7 @@ def test_isatty():
def test_seek_mode_0(): def test_seek_mode_0():
# Arrange # Arrange
mode = 0 mode = 0
with open(TEST_FILE) as fh: with open(TEST_FILE, "rb") as fh:
container = ContainerIO.ContainerIO(fh, 22, 100) container = ContainerIO.ContainerIO(fh, 22, 100)
# Act # Act
@ -34,7 +34,7 @@ def test_seek_mode_0():
def test_seek_mode_1(): def test_seek_mode_1():
# Arrange # Arrange
mode = 1 mode = 1
with open(TEST_FILE) as fh: with open(TEST_FILE, "rb") as fh:
container = ContainerIO.ContainerIO(fh, 22, 100) container = ContainerIO.ContainerIO(fh, 22, 100)
# Act # Act
@ -48,7 +48,7 @@ def test_seek_mode_1():
def test_seek_mode_2(): def test_seek_mode_2():
# Arrange # Arrange
mode = 2 mode = 2
with open(TEST_FILE) as fh: with open(TEST_FILE, "rb") as fh:
container = ContainerIO.ContainerIO(fh, 22, 100) container = ContainerIO.ContainerIO(fh, 22, 100)
# Act # Act
@ -61,73 +61,87 @@ def test_seek_mode_2():
def test_read_n0(): def test_read_n0():
# Arrange # Arrange
with open(TEST_FILE) as fh: for bytesmode in (True, False):
container = ContainerIO.ContainerIO(fh, 22, 100) with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
container = ContainerIO.ContainerIO(fh, 22, 100)
# Act # Act
container.seek(81) container.seek(81)
data = container.read() data = container.read()
# Assert # Assert
assert data == "7\nThis is line 8\n" if bytesmode:
data = data.decode()
assert data == "7\nThis is line 8\n"
def test_read_n(): def test_read_n():
# Arrange # Arrange
with open(TEST_FILE) as fh: for bytesmode in (True, False):
container = ContainerIO.ContainerIO(fh, 22, 100) with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
container = ContainerIO.ContainerIO(fh, 22, 100)
# Act # Act
container.seek(81) container.seek(81)
data = container.read(3) data = container.read(3)
# Assert # Assert
assert data == "7\nT" if bytesmode:
data = data.decode()
assert data == "7\nT"
def test_read_eof(): def test_read_eof():
# Arrange # Arrange
with open(TEST_FILE) as fh: for bytesmode in (True, False):
container = ContainerIO.ContainerIO(fh, 22, 100) with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
container = ContainerIO.ContainerIO(fh, 22, 100)
# Act # Act
container.seek(100) container.seek(100)
data = container.read() data = container.read()
# Assert # Assert
assert data == "" if bytesmode:
data = data.decode()
assert data == ""
def test_readline(): def test_readline():
# Arrange # Arrange
with open(TEST_FILE) as fh: for bytesmode in (True, False):
container = ContainerIO.ContainerIO(fh, 0, 120) with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
container = ContainerIO.ContainerIO(fh, 0, 120)
# Act # Act
data = container.readline() data = container.readline()
# Assert # Assert
assert data == "This is line 1\n" if bytesmode:
data = data.decode()
assert data == "This is line 1\n"
def test_readlines(): def test_readlines():
# Arrange # Arrange
expected = [ for bytesmode in (True, False):
"This is line 1\n", expected = [
"This is line 2\n", "This is line 1\n",
"This is line 3\n", "This is line 2\n",
"This is line 4\n", "This is line 3\n",
"This is line 5\n", "This is line 4\n",
"This is line 6\n", "This is line 5\n",
"This is line 7\n", "This is line 6\n",
"This is line 8\n", "This is line 7\n",
] "This is line 8\n",
with open(TEST_FILE) as fh: ]
container = ContainerIO.ContainerIO(fh, 0, 120) with open(TEST_FILE, "rb" if bytesmode else "r") as fh:
container = ContainerIO.ContainerIO(fh, 0, 120)
# Act # Act
data = container.readlines() data = container.readlines()
# Assert # Assert
if bytesmode:
assert data == expected data = [line.decode() for line in data]
assert data == expected

7
src/PIL/ContainerIO.py
View File

@ -82,7 +82,7 @@ class ContainerIO:
else: else:
n = self.length - self.pos n = self.length - self.pos
if not n: # EOF if not n: # EOF
return "" return b"" if "b" in self.fh.mode else ""
self.pos = self.pos + n self.pos = self.pos + n
return self.fh.read(n) return self.fh.read(n)
@ -92,13 +92,14 @@ class ContainerIO:
:returns: An 8-bit string. :returns: An 8-bit string.
""" """
s = "" s = b"" if "b" in self.fh.mode else ""
newline_character = b"\n" if "b" in self.fh.mode else "\n"
while True: while True:
c = self.read(1) c = self.read(1)
if not c: if not c:
break break
s = s + c s = s + c
if c == "\n": if c == newline_character:
break break
return s return s