From 71a5d4772a64891223b30eda1d97deea5f8926e0 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Sat, 27 Mar 2021 16:55:08 +0100 Subject: [PATCH] Catch Palette IndexError (#1100) * thread palette catch indexerror * export threadlist with utf-8 --- lib/extensions/zip.py | 2 +- lib/threads/palette.py | 2 +- templates/embroider_settings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/extensions/zip.py b/lib/extensions/zip.py index fedf8c655..eacf22603 100644 --- a/lib/extensions/zip.py +++ b/lib/extensions/zip.py @@ -55,7 +55,7 @@ class Zip(InkstitchExtension): svg.write(etree.tostring(document).decode('utf-8')) elif format == 'threadlist': output_file = os.path.join(path, "%s_%s.txt" % (base_file_name, _("threadlist"))) - output = open(output_file, 'w') + output = open(output_file, 'w', encoding='utf-8') output.write(self.get_threadlist(stitch_plan, base_file_name)) output.close() else: diff --git a/lib/threads/palette.py b/lib/threads/palette.py index c5e3002c1..de7ed6f01 100644 --- a/lib/threads/palette.py +++ b/lib/threads/palette.py @@ -57,7 +57,7 @@ class ThreadPalette(Set): thread = ThreadColor(thread_color, thread_name, thread_number, manufacturer=self.name) self.threads[thread] = convert_color(sRGBColor(*thread_color, is_upscaled=True), LabColor) - except ValueError: + except (ValueError, IndexError): continue def __contains__(self, thread): diff --git a/templates/embroider_settings.xml b/templates/embroider_settings.xml index 450068b45..1c7bc966e 100644 --- a/templates/embroider_settings.xml +++ b/templates/embroider_settings.xml @@ -1,6 +1,6 @@ - {% trans %}Settings{% endtrans %} + {% trans %}Preferences{% endtrans %} org.inkstitch.embroider_settings.{{ locale }} embroider_settings