Merge branch 'master' into xygrid_infotext_improvements

1 files changed, 2 insertions, 13 deletions

diff --git a/modules/styles.py b/modules/styles.py
index d44dfc1a..ce6e71ca 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -45,7 +45,7 @@ class StyleDatabase:
         if not os.path.exists(path):

             return

 

-        with open(path, "r", encoding="utf8", newline='') as file:

+        with open(path, "r", encoding="utf-8-sig", newline='') as file:

             reader = csv.DictReader(file)

             for row in reader:

                 # Support loading old CSV format with "name, text"-columns

@@ -65,21 +65,10 @@ class StyleDatabase:
     def apply_negative_styles_to_prompt(self, prompt, styles):

         return apply_styles_to_prompt(prompt, [self.styles.get(x, self.no_style).negative_prompt for x in styles])

 

-    def apply_styles(self, p: StableDiffusionProcessing) -> None:

-        if isinstance(p.prompt, list):

-            p.prompt = [self.apply_styles_to_prompt(prompt, p.styles) for prompt in p.prompt]

-        else:

-            p.prompt = self.apply_styles_to_prompt(p.prompt, p.styles)

-

-        if isinstance(p.negative_prompt, list):

-            p.negative_prompt = [self.apply_negative_styles_to_prompt(prompt, p.styles) for prompt in p.negative_prompt]

-        else:

-            p.negative_prompt = self.apply_negative_styles_to_prompt(p.negative_prompt, p.styles)

-

     def save_styles(self, path: str) -> None:

         # Write to temporary file first, so we don't nuke the file if something goes wrong

         fd, temp_path = tempfile.mkstemp(".csv")

-        with os.fdopen(fd, "w", encoding="utf8", newline='') as file:

+        with os.fdopen(fd, "w", encoding="utf-8-sig", newline='') as file:

             # _fields is actually part of the public API: typing.NamedTuple is a replacement for collections.NamedTuple,

             # and collections.NamedTuple has explicit documentation for accessing _fields. Same goes for _asdict()

             writer = csv.DictWriter(file, fieldnames=PromptStyle._fields)