From: Ralf Jung Date: Sat, 7 Sep 2013 10:12:11 +0000 (+0200) Subject: convert DSL to Python3 (just ran 2to3) X-Git-Url: https://git.ralfj.de/lilass.git/commitdiff_plain/aaa0b27561726d84cc7c3fcfd16302c87dc628d7?ds=sidebyside;hp=--cc convert DSL to Python3 (just ran 2to3) --- aaa0b27561726d84cc7c3fcfd16302c87dc628d7 diff --git a/dsl.py b/dsl.py index b4f77bf..9dd2223 100755 --- a/dsl.py +++ b/dsl.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # DSL - easy Display Setup for Laptops # Copyright (C) 2012 Ralf Jung # @@ -118,7 +118,7 @@ def getXrandrInformation(): # unknown line # not fatal as my xrandr shows strange stuff when a display is enabled, but not connected #raise Exception("Unknown line in xrandr output:\n"+line) - print "Warning: Unknown xrandr line %s" % line + print("Warning: Unknown xrandr line %s" % line) return connectors # convert a (width, height) pair into a string accepted by xrandr as argument for --mode @@ -171,7 +171,7 @@ def classifyConnectors(allConnectors): if connector == internalConnector: raise Exception("%s is both internal and external, that doesn't make sense." % connector) else: - externalConnectors = allConnectors.keys() + externalConnectors = list(allConnectors.keys()) externalConnectors.remove(internalConnector) if not externalConnectors: raise Exception("No external connector found - either your config is wrong, or your machine has only one connector.") @@ -232,7 +232,7 @@ if __name__ == "__main__": call = ["xrandr"] for name in connectorArgs: call += ["--output", name] + connectorArgs[name] - print "Call that will be made:",call + print("Call that will be made:",call) subprocess.check_call(call) except Exception as e: frontend.error(str(e)) diff --git a/gui.py b/gui.py index a87b82f..560cb01 100644 --- a/gui.py +++ b/gui.py @@ -36,7 +36,7 @@ class QtFrontend: def __init__(self): from PyQt4 import QtGui self.app = QtGui.QApplication(sys.argv) - print "Qt loaded" + print("Qt loaded") def error(self, message): from PyQt4 import QtGui @@ -78,7 +78,7 @@ class ZenityFrontend: # CLI frontend class CLIFrontend: def error(self, message): - print >> sys.stderr, message + print(message, file=sys.stderr) def setup(self, internalResolutions, externalResolutions): raise Exception("Choosing the setup interactively is not supported with the CLI frontend") @@ -103,7 +103,7 @@ def getFrontend(name = None): # frontend not found or not available raise Exception("Frontend %s not found or not available" % name) # auto-detect - for frontend in frontends.values(): + for frontend in list(frontends.values()): if frontend.isAvailable(): return frontend() # call constructor raise Exception("No frontend is available - this should not happen") diff --git a/zenity_dialogue.py b/zenity_dialogue.py index 60d7827..75011f8 100644 --- a/zenity_dialogue.py +++ b/zenity_dialogue.py @@ -20,7 +20,7 @@ from dsl import RelativeScreenPosition, ScreenSetup, res2user, processOutputIt def userChoose (title, choices, returns, fallback): assert len(choices) == len(returns) args = ["zenity", "--list", "--text="+title, "--column="]+choices - switch = dict (zip (choices,returns)) + switch = dict (list(zip (choices,returns))) for line in processOutputIt(*args): return switch.get(line.strip(), fallback) return fallback @@ -31,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