Ticket #178: exception-handling-fix.patch

winswitch/server/controller.py

@@ -539 +539 @@
                         try:
                                 display_no = int(display)
                         except Exception, e:
-                                self.serror("%s is not an X lockfile: " % (display, e))
+                                self.serror("%s is not an X lockfile: %s" % (display, e))
                                 continue
                         port = X_PORT_BASE+display_no
                         detected.append(port)

winswitch/server/server_wrapper.py

@@ -65 +65 @@
                 exit_code = 0
         except Exception, e:
                 print("winswitch_server.py")
-                print('*** Caught exception: %s: %s' % (e.__cl, e))
+                print('*** Caught exception: %s: %s' % (type(e).__name__, e))
                 traceback.print_exc()
                 exit_code = 1
         server.cleanup()