From 63f0d7a0f6b6d762b8c15894c531b687ac843c66 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Fri, 14 May 2021 06:57:31 +0200
Subject: [PATCH] [2.2.x] Refs #32718 -- Fixed
 file_storage.test_generate_filename and model_fields.test_filefield tests on
 Python 3.5.

---
 tests/file_storage/test_generate_filename.py | 8 ++++----
 tests/model_fields/test_filefield.py         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/file_storage/test_generate_filename.py b/tests/file_storage/test_generate_filename.py
index 66551c495b..cb64650920 100644
--- a/tests/file_storage/test_generate_filename.py
+++ b/tests/file_storage/test_generate_filename.py
@@ -71,7 +71,7 @@ class GenerateFilenameStorageTests(SimpleTestCase):
         ]
         f = FileField(upload_to='some/folder/')
         for file_name, msg_file_name in candidates:
-            msg = f"Could not derive file name from '{msg_file_name}'"
+            msg = "Could not derive file name from '%s'" % msg_file_name
             with self.subTest(file_name=file_name):
                 with self.assertRaisesMessage(SuspiciousFileOperation, msg):
                     f.generate_filename(None, file_name)
@@ -89,7 +89,7 @@ class GenerateFilenameStorageTests(SimpleTestCase):
             '/tmp/../path',
         ]
         for file_name in candidates:
-            msg = f"Detected path traversal attempt in '{file_name}'"
+            msg = "Detected path traversal attempt in '%s'" % file_name
             with self.subTest(file_name=file_name):
                 with self.assertRaisesMessage(SuspiciousFileOperation, msg):
                     f.generate_filename(None, file_name)
@@ -145,7 +145,7 @@ class GenerateFilenameStorageTests(SimpleTestCase):
             '$.$.$',
         ]
         for file_name in candidates:
-            msg = f"Detected path traversal attempt in '/tmp/{file_name}'"
+            msg = "Detected path traversal attempt in '/tmp/%s'" % file_name
             with self.subTest(file_name=file_name):
                 with self.assertRaisesMessage(SuspiciousFileOperation, msg):
                     f.generate_filename(None, file_name)
@@ -157,7 +157,7 @@ class GenerateFilenameStorageTests(SimpleTestCase):
         f = FileField(upload_to=upload_to)
         candidates = ['..', '.', '']
         for file_name in candidates:
-            msg = f"Could not derive file name from '/tmp/{file_name}'"
+            msg = "Could not derive file name from '/tmp/%s'" % file_name
             with self.subTest(file_name=file_name):
                 with self.assertRaisesMessage(SuspiciousFileOperation, msg):
                     f.generate_filename(None, file_name)
diff --git a/tests/model_fields/test_filefield.py b/tests/model_fields/test_filefield.py
index 2c99c34957..0afef7284e 100644
--- a/tests/model_fields/test_filefield.py
+++ b/tests/model_fields/test_filefield.py
@@ -66,7 +66,7 @@ class FileFieldTests(TestCase):
         with tempfile.NamedTemporaryFile(suffix='.txt') as tmp:
             document = Document.objects.create(myfile='something.txt')
             document.myfile = File(tmp)
-            msg = f"Detected path traversal attempt in '{tmp.name}'"
+            msg = "Detected path traversal attempt in '%s'" % tmp.name
             with self.assertRaisesMessage(SuspiciousFileOperation, msg):
                 document.save()