convert DSL to Python3 (just ran 2to3)

[lilass.git] / zenity_dialogue.py

diff --git a/zenity_dialogue.py b/zenity_dialogue.py
index 45cf557a9bea9edbca5b744bee84f094c7f79090..75011f8dc1d408a008347190efc57b325c68cde3 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)
-       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