Merge remote-tracking branch 'origin/master' into lexelby-mac-build-mk2

1 files changed, 18 insertions, 3 deletions

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