reverse: Ensure we don't permanently hijack stdout/err or leave sockets open

pyrasite/reverse.py

@@ -109,9 +109,10 @@ class ReversePythonConnection(ReverseConnection):
             output = buffer.getvalue()
         except:
             output = traceback.format_exc()
-        sys.stdout = sys.__stdout__
-        sys.stderr = sys.__stderr__
-        buffer.close()
+        finally:
+            sys.stdout = sys.__stdout__
+            sys.stderr = sys.__stderr__
+            buffer.close()
         self.send(output)
         return True
 
@@ -186,6 +187,6 @@ class ReversePythonShell(threading.Thread, pyrasite.PyrasiteIPC):
             pass
         except:
             traceback.print_exc(file=sys.__stderr__)
-
-        sys.stdout, sys.stderr = sys.__stdout__, sys.__stderr__
-        self.close()
+        finally:
+            sys.stdout, sys.stderr = sys.__stdout__, sys.__stderr__
+            self.close()

pyrasite/tools/shell.py

@@ -73,8 +73,8 @@ def shell():
     except:
         print('')
         raise
-
-    ipc.close()
+    finally:
+        ipc.close()
 
 
 if __name__ == '__main__':