Merge remote-tracking branch 'origin/master' into dev

Author: karliss

inkcut/core/svg.py

@@ -170,7 +170,7 @@ def parseTransform(self, e):
             return t
 
         m = re.match(
-            "(translate|scale|rotate|skewX|skewY|matrix)\s*\(([^)]*)\)\s*,?",
+            r"(translate|scale|rotate|skewX|skewY|matrix)\s*\(([^)]*)\)\s*,?",
             trans)
         if m is None:
             return t

inkcut/ui/plugin.py

@@ -11,7 +11,7 @@
 """
 import sys
 import enaml
-import pkg_resources
+import importlib.metadata
 from datetime import datetime
 from atom.api import Atom, Int, List, Str, Instance, Bool, Enum, Dict
 from enaml.qt.q_resource_helpers import get_cached_qicon
@@ -112,8 +112,8 @@ def load_plugins(self):
             plugins.append(MonitorManifest)
 
             #: Load any plugins defined as extension points
-            for entry_point in pkg_resources.iter_entry_points(
-                    group='inkcut.plugin', name=None):
+            for entry_point in importlib.metadata.entry_points(
+                    group='inkcut.plugin'):
                 plugins.append(entry_point.load())
 
         #: Install all of them

plugins/inkscape/inkcut4inkscape.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
 Inkcut, Plot HPGL directly from Inkscape.

plugins/inkscape/inkcut_cut.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
 Inkcut, Plot HPGL directly from Inkscape.

plugins/inkscape/inkcut_open.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
 Inkcut, Plot HPGL directly from Inkscape.