It does not like me to always properly clean up the xrandr process, so just don't...

diff --git a/dsl.py b/dsl.py
index 0704d3e8f3da546f9b5e510976cf98bcbebe328a..fa7750a55fc355213f3629e77ae0a85be0265025 100755 (executable)
--- a/dsl.py
+++ b/dsl.py
@@ -49,32 +49,30 @@ def loadConfigFile(file):
 def getXrandrInformation():
        p = subprocess.Popen(["xrandr", "-q"], stdout=subprocess.PIPE)
        connectors = {} # map of connector names to a list of resolutions
 def getXrandrInformation():
        p = subprocess.Popen(["xrandr", "-q"], stdout=subprocess.PIPE)
        connectors = {} # map of connector names to a list of resolutions

-       try:
-               connector = None # current connector
-               for line in p.stdout:
-                       # screen?
-                       m = re.search(r'^Screen [0-9]+: ', line)
-                       if m is not None: # ignore this line
-                               connector = None
-                               continue
-                       # new connector?
-                       m = re.search(r'^([\w\-]+) (dis)?connected ', line)
-                       if m is not None:
-                               connector = m.groups()[0]
-                               assert connector not in connectors
-                               connectors[connector] = []
-                               continue
-                       # new resolution?
-                       m = re.search(r'^   ([\d]+)x([\d]+) +', line)
-                       if m is not None:
-                               assert connector is not None
-                               connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
-                               continue
-                       # unknown line
-                       raise Exception("Unknown line in xrandr output:\n"+line)
-       finally:
-               # be sure to always proprly finish up with the xrandr
-               p.communicate()
+       connector = None # current connector
+       for line in p.stdout:
+               # screen?
+               m = re.search(r'^Screen [0-9]+: ', line)
+               if m is not None: # ignore this line
+                       connector = None
+                       continue
+               # new connector?
+               m = re.search(r'^([\w\-]+) (dis)?connected ', line)
+               if m is not None:
+                       connector = m.groups()[0]
+                       assert connector not in connectors
+                       connectors[connector] = []
+                       continue
+               # new resolution?
+               m = re.search(r'^   ([\d]+)x([\d]+) +', line)
+               if m is not None:
+                       assert connector is not None
+                       connectors[connector].append((int(m.groups()[0]), int(m.groups()[1])))
+                       continue
+               # unknown line
+               raise Exception("Unknown line in xrandr output:\n"+line)
+       # be sure to always proprly finish up with the xrandr
+       p.communicate()

        # if everything succeededso far, check return code
        if p.returncode != 0: raise Exception("Querying xrandr for data failed.")
        return connectors
        # if everything succeededso far, check return code
        if p.returncode != 0: raise Exception("Querying xrandr for data failed.")
        return connectors

diff --git a/gui.py b/gui.py
index edb9b2b9a8086ceeeddb794986891cb6599df1fb..a85f2d52bcb8bd57abe07eb0e303f4a06c5f02aa 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -22,4 +22,3 @@ app = QtGui.QApplication(sys.argv)
 
 def error(message):
        QtGui.QMessageBox.critical(None, 'Fatal error', message)
 
 def error(message):
        QtGui.QMessageBox.critical(None, 'Fatal error', message)

-       raise Exception(message)