4 files changed, 38 insertions, 3 deletions
diff --git a/lib/utils/__init__.py b/lib/utils/__init__.py
index ff06d4a9..78d037f1 100644
--- a/lib/utils/__init__.py
+++ b/lib/utils/__init__.py
@@ -2,3 +2,4 @@ from geometry import *
 from cache import cache
 from io import *
 from inkscape import *
+from paths import *
diff --git a/lib/utils/geometry.py b/lib/utils/geometry.py
index 61b98bcb..d0cb96cf 100644
--- a/lib/utils/geometry.py
+++ b/lib/utils/geometry.py
@@ -65,12 +65,21 @@ class Point:
         else:
             raise ValueError("cannot multiply Point by %s" % type(other))
 
+    def __neg__(self):
+        return self * -1
+
     def __rmul__(self, other):
         if isinstance(other, (int, float)):
             return self.__mul__(other)
         else:
             raise ValueError("cannot multiply Point by %s" % type(other))
 
+    def __div__(self, other):
+        if isinstance(other, (int, float)):
+            return self * (1.0 / other)
+        else:
+            raise ValueErorr("cannot divide Point by %s" % type(other))
+
     def __repr__(self):
         return "Point(%s,%s)" % (self.x, self.y)
 
diff --git a/lib/utils/io.py b/lib/utils/io.py
index be1fdf24..e5a246f3 100644
--- a/lib/utils/io.py
+++ b/lib/utils/io.py
@@ -7,12 +7,27 @@ def save_stderr():
     # GTK likes to spam stderr, which inkscape will show in a dialog.
     null = open(os.devnull, 'w')
     sys.stderr_dup = os.dup(sys.stderr.fileno())
+    sys.real_stderr = os.fdopen(sys.stderr_dup, 'w')
     os.dup2(null.fileno(), 2)
-    sys.stderr_backup = sys.stderr
     sys.stderr = StringIO()
 
 
 def restore_stderr():
     os.dup2(sys.stderr_dup, 2)
-    sys.stderr_backup.write(sys.stderr.getvalue())
-    sys.stderr = sys.stderr_backup
+    sys.real_stderr.write(sys.stderr.getvalue())
+    sys.stderr = sys.real_stderr
+
+# It's probably possible to generalize this code, but when I tried,
+# the result was incredibly unreadable.
+def save_stdout():
+    null = open(os.devnull, 'w')
+    sys.stdout_dup = os.dup(sys.stdout.fileno())
+    sys.real_stdout = os.fdopen(sys.stdout_dup, 'w')
+    os.dup2(null.fileno(), 1)
+    sys.stdout = StringIO()
+
+
+def restore_stdout():
+    os.dup2(sys.stdout_dup, 1)
+    sys.real_stdout.write(sys.stdout.getvalue())
+    sys.stdout = sys.real_stdout
diff --git a/lib/utils/paths.py b/lib/utils/paths.py
new file mode 100644
index 00000000..863e8e69
--- /dev/null
+++ b/lib/utils/paths.py
@@ -0,0 +1,10 @@
+import sys
+import os
+from os.path import dirname, realpath
+
+
+def get_bundled_dir(name):
+    if getattr(sys, 'frozen', None) is not None:
+        return realpath(os.path.join(sys._MEIPASS, "..", name))
+    else:
+        return realpath(os.path.join(dirname(realpath(__file__)), '..', '..', name))