Satisfy ruff again

tests/flickr/test_fetch_fetchers.py

@@ -170,9 +170,9 @@ def test_calls_save_user_correctly(self, save_user, fetch_avatar):
     def test_downloads_and_saves_avatar(self, download):
         "Should call download() and save avatar when fetching user."
         # Make a temporary file, like download() would make:
-        jpg = tempfile.NamedTemporaryFile()
-        temp_filepath = jpg.name
-        download.return_value = temp_filepath
+        with tempfile.NamedTemporaryFile() as jpg:
+            temp_filepath = jpg.name
+            download.return_value = temp_filepath
 
         self.expect_response("people.getInfo")
         UserFetcher(account=self.account).fetch(nsid="35034346050@N01")

tests/flickr/test_fetch_filesfetchers.py

@@ -149,9 +149,9 @@ def test_raises_error_if_download_fails(self, download):
     @patch.object(filedownloader, "download")
     def test_saves_downloaded_photo_file(self, download):
         # Make a temporary file, like download() would make:
-        jpg = tempfile.NamedTemporaryFile()
-        temp_filepath = jpg.name
-        download.return_value = temp_filepath
+        with tempfile.NamedTemporaryFile() as jpg:
+            temp_filepath = jpg.name
+            download.return_value = temp_filepath
 
         self.fetcher._fetch_and_save_file(self.photo_2, "photo")
         nsid = self.photo_2.user.nsid
@@ -170,9 +170,9 @@ def test_saves_downloaded_photo_file(self, download):
     @patch.object(filedownloader, "download")
     def test_saves_downloaded_video_file(self, download):
         # Make a temporary file, like download() would make:
-        video = tempfile.NamedTemporaryFile()
-        temp_filepath = video.name
-        download.return_value = temp_filepath
+        with tempfile.NamedTemporaryFile() as video:
+            temp_filepath = video.name
+            download.return_value = temp_filepath
 
         self.fetcher._fetch_and_save_file(self.video_2, "video")
         nsid = self.video_2.user.nsid

tests/twitter/test_fetch_fetchers.py

@@ -969,9 +969,9 @@ def test_raises_error_if_download_fails(self, download):
     @patch.object(filedownloader, "download")
     def test_saves_downloaded_image_file(self, download):
         # Make a temporary file, like download() would make:
-        jpg = tempfile.NamedTemporaryFile()
-        temp_filepath = jpg.name
-        download.return_value = temp_filepath
+        with tempfile.NamedTemporaryFile() as jpg:
+            temp_filepath = jpg.name
+            download.return_value = temp_filepath
 
         FetchFiles()._fetch_and_save_file(self.image, "image")
         self.assertEqual(
@@ -986,9 +986,9 @@ def test_saves_downloaded_image_file(self, download):
     @patch.object(filedownloader, "download")
     def test_saves_downloaded_mp4_file(self, download):
         # Make a temporary file, like download() would make:
-        mp4 = tempfile.NamedTemporaryFile()
-        temp_filepath = mp4.name
-        download.return_value = temp_filepath
+        with tempfile.NamedTemporaryFile() as mp4:
+            temp_filepath = mp4.name
+            download.return_value = temp_filepath
 
         FetchFiles()._fetch_and_save_file(self.animated_gif, "mp4")
         self.assertEqual(

tests/twitter/test_fetch_savers.py

@@ -480,9 +480,9 @@ def test_calls_fetch_and_save_avatar(self, fetch_avatar, download):
     def test_downloads_and_saves_avatar(self, download):
         "Should call download() and save avatar."
         # Make a temporary file, like download() would make:
-        jpg = tempfile.NamedTemporaryFile()
-        temp_filepath = jpg.name
-        download.return_value = temp_filepath
+        with tempfile.NamedTemporaryFile() as jpg:
+            temp_filepath = jpg.name
+            download.return_value = temp_filepath
 
         user_data = self.make_user_data()
         saved_user = UserSaver().save_user(user_data, datetime_now())

tests/twitter/test_models.py

@@ -54,7 +54,7 @@ def add_response(self, body, call, status=200):
     def test_str_1(self):
         "Has the correct string represntation when it has no user"
         account = AccountFactory(user=None)
-        self.assertEqual(account.__str__(), "%d" % account.pk)
+        self.assertEqual(account.__str__(), f"{account.pk}")
 
     def test_str_2(self):
         "Has the correct string represntation when it has a user"
@@ -184,7 +184,7 @@ class PhotoTestCase(TestCase):
 
     def test_str(self):
         photo = PhotoFactory()
-        self.assertEqual(photo.__str__(), "Photo %d" % photo.id)
+        self.assertEqual(photo.__str__(), f"Photo {photo.id}")
 
     def test_media_type(self):
         photo = PhotoFactory()
@@ -301,7 +301,7 @@ class VideoTestCase(TestCase):
 
     def test_str(self):
         video = VideoFactory()
-        self.assertEqual(video.__str__(), "Video %d" % video.id)
+        self.assertEqual(video.__str__(), f"Video {video.id}")
 
     def test_media_type(self):
         video = VideoFactory()
@@ -362,7 +362,7 @@ class AnimatedGifTestCase(TestCase):
 
     def test_str(self):
         gif = AnimatedGifFactory()
-        self.assertEqual(gif.__str__(), "Animated GIF %d" % gif.id)
+        self.assertEqual(gif.__str__(), f"Animated GIF {gif.id}")
 
     def test_media_type(self):
         gif = AnimatedGifFactory()