1 files changed, 9 insertions, 9 deletions

diff --git a/modules/images.py b/modules/images.py
index 6ceb7c7c..7392cb8b 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -19,7 +19,7 @@ import json
 import hashlib

 

 from modules import sd_samplers, shared, script_callbacks, errors

-from modules.shared import opts, cmd_opts

+from modules.shared import opts

 

 LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.LANCZOS)

 

@@ -409,13 +409,13 @@ class FilenameGenerator:
         time_format = args[0] if len(args) > 0 and args[0] != "" else self.default_time_format

         try:

             time_zone = pytz.timezone(args[1]) if len(args) > 1 else None

-        except pytz.exceptions.UnknownTimeZoneError as _:

+        except pytz.exceptions.UnknownTimeZoneError:

             time_zone = None

 

         time_zone_time = time_datetime.astimezone(time_zone)

         try:

             formatted_time = time_zone_time.strftime(time_format)

-        except (ValueError, TypeError) as _:

+        except (ValueError, TypeError):

             formatted_time = time_zone_time.strftime(self.default_time_format)

 

         return sanitize_filename_part(formatted_time, replace_spaces=False)

@@ -467,14 +467,14 @@ def get_next_sequence_number(path, basename):
     """

     result = -1

     if basename != '':

-        basename = basename + "-"

+        basename = f"{basename}-"

 

     prefix_length = len(basename)

     for p in os.listdir(path):

         if p.startswith(basename):

-            l = os.path.splitext(p[prefix_length:])[0].split('-')  # splits the filename (removing the basename first if one is defined, so the sequence number is always the first element)

+            parts = os.path.splitext(p[prefix_length:])[0].split('-')  # splits the filename (removing the basename first if one is defined, so the sequence number is always the first element)

             try:

-                result = max(int(l[0]), result)

+                result = max(int(parts[0]), result)

             except ValueError:

                 pass

 

@@ -536,7 +536,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
         add_number = opts.save_images_add_number or file_decoration == ''

 

         if file_decoration != "" and add_number:

-            file_decoration = "-" + file_decoration

+            file_decoration = f"-{file_decoration}"

 

         file_decoration = namegen.apply(file_decoration) + suffix

 

@@ -566,7 +566,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
 

     def _atomically_save_image(image_to_save, filename_without_extension, extension):

         # save image with .tmp extension to avoid race condition when another process detects new image in the directory

-        temp_file_path = filename_without_extension + ".tmp"

+        temp_file_path = f"{filename_without_extension}.tmp"

         image_format = Image.registered_extensions()[extension]

 

         if extension.lower() == '.png':

@@ -626,7 +626,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
     if opts.save_txt and info is not None:

         txt_fullfn = f"{fullfn_without_extension}.txt"

         with open(txt_fullfn, "w", encoding="utf8") as file:

-            file.write(info + "\n")

+            file.write(f"{info}\n")

     else:

         txt_fullfn = None