properly open and close processes

[lilass.git] / zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 69365e8325d8c8882f06450ca3f28ec5e0f1b6ee..60d7827f72527e863e0edeb42526a60bc7745b89 100644 (file)
--- a/zenity_dialogue.py
+++ b/zenity_dialogue.py
@@ -15,14 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import subprocess
-from dsl import RelativeScreenPosition, ScreenSetup, res2user
+from dsl import RelativeScreenPosition, ScreenSetup, res2user, processOutputIt
 
 def userChoose (title, choices, returns, fallback):
        assert len(choices) == len(returns)
-       p = subprocess.Popen(["zenity", "--list", "--text="+title, "--column="]+choices, stdout=subprocess.PIPE)
+       args = ["zenity", "--list", "--text="+title, "--column="]+choices
        switch = dict (zip (choices,returns))
-       for line in p.stdout: # FIXME use p.communicate()[0] instead to get entire stdout and ensure the process terminates. also check p.returncode.
+       for line in processOutputIt(*args):
                return switch.get(line.strip(), fallback)
        return fallback