s3: Fix newline handling for text-mode files

storages/backends/s3.py

@@ -1,5 +1,6 @@
 import mimetypes
 import os
+import io
 import posixpath
 import tempfile
 import threading
@@ -123,7 +124,6 @@ def __init__(self, name, mode, storage, buffer_size=None):
         self._storage = storage
         self.name = name[len(self._storage.location) :].lstrip("/")
         self._mode = mode
-        self._force_mode = (lambda b: b) if "b" in mode else (lambda b: b.decode())
         self.obj = storage.bucket.Object(name)
         if "w" not in mode:
             # Force early RAII-style exception if object does not exist
@@ -184,6 +184,8 @@ def _get_file(self):
                 self._file.seek(0)
                 if self._storage.gzip and self.obj.content_encoding == "gzip":
                     self._file = self._decompress_file(mode=self._mode, file=self._file)
+                elif "b" not in self._mode:
+                    self._file = io.TextIOWrapper(self._file._file, encoding="utf-8")
             self._closed = False
         return self._file
 
@@ -195,12 +197,12 @@ def _set_file(self, value):
     def read(self, *args, **kwargs):
         if "r" not in self._mode:
             raise AttributeError("File was not opened in read mode.")
-        return self._force_mode(super().read(*args, **kwargs))
+        return super().read(*args, **kwargs)
 
     def readline(self, *args, **kwargs):
         if "r" not in self._mode:
             raise AttributeError("File was not opened in read mode.")
-        return self._force_mode(super().readline(*args, **kwargs))
+        return super().readline(*args, **kwargs)
 
     def readlines(self):
         return list(self)

tests/test_s3.py

@@ -305,25 +305,6 @@ def test_storage_open_read_string(self):
         self.assertEqual(content_str, "")
         file.close()
 
-    def test_storage_open_readlines(self):
-        """
-        Test readlines with file opened in "r" and "rb" modes
-        """
-        name = "test_open_readlines_string.txt"
-        with io.BytesIO() as temp_file:
-            temp_file.write(b"line1\nline2")
-            file = self.storage.open(name, "r")
-            file._file = temp_file
-
-            content_lines = file.readlines()
-            self.assertEqual(content_lines, ["line1\n", "line2"])
-
-            temp_file.seek(0)
-            file = self.storage.open(name, "rb")
-            file._file = temp_file
-            content_lines = file.readlines()
-            self.assertEqual(content_lines, [b"line1\n", b"line2"])
-
     def test_storage_open_write(self):
         """
         Test opening a file in write mode
@@ -1145,6 +1126,48 @@ def test_content_type_not_detectable(self):
             s3.S3Storage.default_content_type,
         )
 
+    def test_storage_open_read_with_newlines(self):
+        """
+        Test opening a file in "r" and "rb" mode with various newline characters
+        """
+        name = "test_storage_open_read_with_newlines.txt"
+        with io.BytesIO() as temp_file:
+            temp_file.write(b"line1\nline2\r\nmore\rtext\n")
+            self.storage.save(name, temp_file)
+            file = self.storage.open(name, "r")
+            content_str = file.read()
+            file.close()
+        self.assertEqual(content_str, "line1\nline2\nmore\ntext\n")
+
+        with io.BytesIO() as temp_file:
+            temp_file.write(b"line1\nline2\r\nmore\rtext\n")
+            self.storage.save(name, temp_file)
+            file = self.storage.open(name, "rb")
+            content_str = file.read()
+            file.close()
+        self.assertEqual(content_str, b"line1\nline2\r\nmore\rtext\n")
+
+    def test_storage_open_readlines_with_newlines(self):
+        """
+        Test readlines with file opened in "r" and "rb" mode with various newline characters
+        """
+        name = "test_storage_open_readlines_with_newlines.txt"
+        with io.BytesIO() as temp_file:
+            temp_file.write(b"line1\nline2\r\nmore\rtext")
+            self.storage.save(name, temp_file)
+            file = self.storage.open(name, "r")
+            content_lines = file.readlines()
+            file.close()
+        self.assertEqual(content_lines, ['line1\n', 'line2\n', 'more\n', 'text'])
+
+        with io.BytesIO() as temp_file:
+            temp_file.write(b"line1\nline2\r\nmore\rtext")
+            self.storage.save(name, temp_file)
+            file = self.storage.open(name, "rb")
+            content_lines = file.readlines()
+            file.close()
+        self.assertEqual(content_lines, [b'line1\n', b'line2\r\n', b'more\r', b'text'])
+
 
 class TestBackwardsNames(TestCase):
     def test_importing(self):

tox.ini

@@ -13,15 +13,16 @@ setenv =
 	DJANGO_SETTINGS_MODULE = tests.settings
 	PYTHONWARNINGS = always
 	PYTHONDONTWRITEBYTECODE = 1
-commands = pytest --cov=storages tests/ {posargs}
+commands = pytest --cov=storages {posargs}
 deps =
 	cryptography
 	django3.2: django~=3.2.9
 	django4.1: django~=4.1.0
 	django4.2: django~=4.2.0
 	django5.0: django~=5.0b1
 	djangomain: https://github.com/django/django/archive/main.tar.gz
-	moto
+	# 5 changes API a bit and also requires python 3.8+, so keep this until we drop py 3.7
+	moto<5
 	pytest
 	pytest-cov
 	rsa
@@ -41,3 +42,8 @@ commands =
 	ruff .
 	black --check .
 skip_install = true
+
+[pytest]
+# Default test paths to run, if no other paths are specified on the CLI
+# (specify paths after a -- e.g. `tox -- tests/test_s3.py`)
+testpaths = tests/