Update for Inkscape 1.0 (#880)

* update for inkscape 1.0
* add about extension
* Build improvements for the inkscape1.0 branch (#985)
* zip: export real svg not stitch plan
* #411 and #726
* Tools for Font Creators (#1018)
* ignore very small holes in fills
* remove embroider (#1026)
* auto_fill: ignore shrink_or_grow if result is empty (#589)
* break apart: do not ignore small fills

Co-authored-by: Hagen Fritsch <rumpeltux-github@irgendwo.org>
Co-authored-by: Lex Neva <github.com@lexneva.name>

3 files changed, 11 insertions, 4 deletions

diff --git a/lib/api/install.py b/lib/api/install.py
index 20138973..f52233fb 100644
--- a/lib/api/install.py
+++ b/lib/api/install.py
@@ -16,7 +16,7 @@ def palettes():
         path = os.path.join(base_path, 'palettes')
         src_dir = get_bundled_dir('palettes')
         copy_files(glob(os.path.join(src_dir, "*")), path)
-    except Exception, exc:
+    except Exception as exc:
         return jsonify({"error": str(exc)}), 500
 
     return jsonify({"status": "success"})
diff --git a/lib/api/server.py b/lib/api/server.py
index bdfa4573..0db253c6 100644
--- a/lib/api/server.py
+++ b/lib/api/server.py
@@ -1,16 +1,17 @@
 import errno
 import logging
 import socket
+import sys
 import time
 from threading import Thread
 
 import requests
 from flask import Flask, g, request
 
+from ..utils.json import InkStitchJSONEncoder
 from .install import install
 from .simulator import simulator
 from .stitch_plan import stitch_plan
-from ..utils.json import InkStitchJSONEncoder
 
 
 class APIServer(Thread):
@@ -27,6 +28,10 @@ class APIServer(Thread):
         self.__setup_app()
 
     def __setup_app(self):  # noqa: C901
+        # Disable warning about using a development server in a production environment
+        cli = sys.modules['flask.cli']
+        cli.show_server_banner = lambda *x: None
+
         self.app = Flask(__name__)
         self.app.json_encoder = InkStitchJSONEncoder
 
@@ -89,7 +94,7 @@ class APIServer(Thread):
                     response = requests.get("http://%s:%s/ping" % (self.host, self.port))
                     if response.status_code == 200:
                         break
-                except socket.error, e:
+                except socket.error as e:
                     if e.errno == errno.ECONNREFUSED:
                         pass
                     else:
diff --git a/lib/api/stitch_plan.py b/lib/api/stitch_plan.py
index fd6bf9c9..95cdc7d8 100644
--- a/lib/api/stitch_plan.py
+++ b/lib/api/stitch_plan.py
@@ -11,7 +11,9 @@ def get_stitch_plan():
     if not g.extension.get_elements():
         return dict(colors=[], stitch_blocks=[], commands=[])
 
+    metadata = g.extension.get_inkstitch_metadata()
+    collapse_len = metadata['collapse_len_mm']
     patches = g.extension.elements_to_patches(g.extension.elements)
-    stitch_plan = patches_to_stitch_plan(patches)
+    stitch_plan = patches_to_stitch_plan(patches, collapse_len=collapse_len)
 
     return jsonify(stitch_plan)