X-Git-Url: https://git.ralfj.de/lilass.git/blobdiff_plain/6c00241a910d36f0d1c0cf0a1a120214f362db43..14aaede5b451a5b903dde99202925eb4a016c231:/zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 45cf557..75011f8 100644
--- 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)
-	switch = dict (zip (choices,returns))
-	for line in p.stdout:
+	args = ["zenity", "--list", "--text="+title, "--column="]+choices
+	switch = dict (list(zip (choices,returns)))
+	for line in processOutputIt(*args):
 		return switch.get(line.strip(), fallback)
 	return fallback
 
@@ -32,8 +31,8 @@ def run (internalResolutions, externalResolutions):
 		return None
 	intres = internalResolutions[0]
 	if relpos != RelativeScreenPosition.EXTERNAL_ONLY:
-		intres = userChoose ("internal display resolution", map(res2user,internalResolutions), internalResolutions, internalResolutions[0])
-	extres = userChoose ("external display resolution", map(res2user,externalResolutions), externalResolutions, externalResolutions[0])
+		intres = userChoose ("internal display resolution", list(map(res2user,internalResolutions)), internalResolutions, internalResolutions[0])
+	extres = userChoose ("external display resolution", list(map(res2user,externalResolutions)), externalResolutions, externalResolutions[0])
 	extprim = userChoose ("Which display should be the primary display?", ["internal display", "external display"], [False, True], None)
 	if extprim == None:
 		return None