From 0f95357e8b47d4b65a2caa4bc5960f76658da0b1 Mon Sep 17 00:00:00 2001
From: htgoebel <>
Date: Sun, 12 Jun 2011 11:24:51 +0000
Subject: [PATCH] Minor code cleanup

---
 .../encrypted_webinterface.py                 | 32 +++++++++----------
 plugins/encrypted_webinterface/root_action.py |  4 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/plugins/encrypted_webinterface/encrypted_webinterface.py b/plugins/encrypted_webinterface/encrypted_webinterface.py
index 56228d2..f830c5a 100644
--- a/plugins/encrypted_webinterface/encrypted_webinterface.py
+++ b/plugins/encrypted_webinterface/encrypted_webinterface.py
@@ -123,23 +123,23 @@ class encrypted_webinterface(cryptobox.plugins.base.CryptoBoxPlugin):
                 cert = self.__get_certificate()
                 if cert is None:
                     ## failed to create a certificate?
-                    self.cbox.log.warn("Failed to import M2Crypto python module" \
-                            + " required for SSL certificate generation")
+                    self.cbox.log.warn("Failed to import M2Crypto python module"
+                            " required for SSL certificate generation")
                     return
                 try:
                     self.cbox.prefs.create_misc_config_file(CERT_FILENAME, cert)
-                    self.cbox.log.info("Created new SSL certificate: %s" % \
-                            cert_abs_name)
+                    self.cbox.log.info("Created new SSL certificate: %s"
+                                       % cert_abs_name)
                     ## make it non-readable for other users
                     try:
                         os.chmod(cert_abs_name, 0600)
                     except OSError, err_msg:
-                        self.cbox.log.warn("Failed to change permissions of secret " \
-                                + "certificate file (%s): %s" % \
-                                (cert_abs_name, err_msg))
+                        self.cbox.log.warn("Failed to change permissions of secret"
+                                " certificate file (%s): %s"
+                                % (cert_abs_name, err_msg))
                 except IOError, err_msg:
                     ## do not run stunnel without a certificate
-                    self.cbox.log.warn("Failed to create new SSL certificate (%s): %s" \
+                    self.cbox.log.warn("Failed to create new SSL certificate (%s): %s"
                             % (cert_abs_name, err_msg))
                     return
             self.__run_stunnel(cert_abs_name)
@@ -151,8 +151,8 @@ class encrypted_webinterface(cryptobox.plugins.base.CryptoBoxPlugin):
         """try to kill a running stunnel daemon
         """
         if not os.path.isfile(PID_FILE):
-            self.cbox.log.warn("Could not find the pid file of a running stunnel " \
-                    + "daemon: %s" % PID_FILE)
+            self.cbox.log.warn("Could not find the pid file of a running stunnel"
+                    " daemon: %s" % PID_FILE)
             return
         try:
             pfile = open(PID_FILE, "r")
@@ -177,20 +177,20 @@ class encrypted_webinterface(cryptobox.plugins.base.CryptoBoxPlugin):
             try:
                 os.remove(PID_FILE)
             except OSError, err_msg:
-                self.cbox.log.warn("Failed to remove the pid file (%s) of stunnel: %s" \
+                self.cbox.log.warn("Failed to remove the pid file (%s) of stunnel: %s"
                         % (PID_FILE, err_msg))
         except OSError, err_msg:
-            self.cbox.log.warn("Failed to kill stunnel process (PID: %d): %s" % \
-                    (pid, err_msg))
+            self.cbox.log.warn("Failed to kill stunnel process (PID: %d): %s"
+                               % (pid, err_msg))
 
 
     def __run_stunnel(self, cert_name, dest_port=443):
         ## retrieve currently requested port (not necessarily the port served
         ## by cherrypy - e.g. in a proxy setup)
         request_port = cherrypy.config.get("server.socket_port", 80)
-        self.cbox.log.debug("[encrypted_webinterface] starting " \
-                + "%s on port %s for %s" % \
-                (self.root_action.STUNNEL_BIN, dest_port, request_port))
+        self.cbox.log.debug("[encrypted_webinterface] starting"
+                " %s on port %s for %s"
+                % (self.root_action.STUNNEL_BIN, dest_port, request_port))
         proc = subprocess.Popen(
             shell = False,
             stdout = subprocess.PIPE,
diff --git a/plugins/encrypted_webinterface/root_action.py b/plugins/encrypted_webinterface/root_action.py
index 1907c75..b93bcb0 100755
--- a/plugins/encrypted_webinterface/root_action.py
+++ b/plugins/encrypted_webinterface/root_action.py
@@ -88,8 +88,8 @@ if __name__ == "__main__":
     self_bin = sys.argv[0]
     
     if len(args) != 4:
-        sys.stderr.write("%s: invalid number of arguments (%d instead of %d))\n" % \
-                (self_bin, len(args), 4))
+        sys.stderr.write("%s: invalid number of arguments (%d instead of %d))\n"
+                % (self_bin, len(args), 4))
         sys.exit(1)
     
     if not run_stunnel(args[0], args[1], args[2], args[3]):