fix more pylint warnings

git-svn-id: https://xpra.org/svn/Xpra/trunk@21706 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/scripts/config.py

@@ -20,10 +20,10 @@
 def warn(msg):
     sys.stderr.write(msg+"\n")
 
-def debug(*args):
+def nodebug(*_args):
     #can be overriden
     pass
-
+debug = nodebug
 
 class InitException(Exception):
     pass
@@ -190,10 +190,10 @@ def OpenGL_safety_check():
         try:
             f = None
             f = open("\\\\.\\VBoxMiniRdrDN", "r")
+            return True, "VirtualBox is present (VBoxMiniRdrDN)"
         finally:
             if f:
                 f.close()
-                return True, "VirtualBox is present (VBoxMiniRdrDN)"
     except Exception as e:
         import errno
         if e.args[0]==errno.EACCES:
@@ -1039,7 +1039,7 @@ def get_defaults():
 CLONES = {}
 
 #these options should not be specified in config files:
-NO_FILE_OPTIONS = ["daemon"]
+NO_FILE_OPTIONS = ("daemon", )
 
 
 TRUE_OPTIONS = ("yes", "true", "1", "on", True)

src/xpra/scripts/main.py

@@ -341,7 +341,10 @@ def run_mode(script_file, error_cb, options, args, mode, defaults):
                         if app.completed_startup:
                             #if we had connected to the session,
                             #we can ignore more error codes:
-                            from xpra.exit_codes import EXIT_CONNECTION_LOST, EXIT_REMOTE_ERROR, EXIT_INTERNAL_ERROR, EXIT_FILE_TOO_BIG
+                            from xpra.exit_codes import (
+                                EXIT_CONNECTION_LOST, EXIT_REMOTE_ERROR,
+                                EXIT_INTERNAL_ERROR, EXIT_FILE_TOO_BIG,
+                                )
                             NO_RETRY += [
                                     EXIT_CONNECTION_LOST,
                                     EXIT_REMOTE_ERROR,
@@ -406,7 +409,12 @@ def attach_client():
                     getChildReaper().add_process(proc, "client-attach", cmd, ignore=True, forget=False)
                 add_when_ready(attach_client)
             return run_server(error_cb, options, mode, script_file, args, current_display)
-        elif mode in ("attach", "detach", "screenshot", "version", "info", "id", "control", "_monitor", "print", "connect-test", "request-start", "request-start-desktop", "request-shadow"):
+        elif mode in (
+            "attach", "detach",
+            "screenshot", "version", "info", "id",
+            "control", "_monitor", "print",
+            "connect-test", "request-start", "request-start-desktop", "request-shadow",
+            ):
             return run_client(error_cb, options, args, mode)
         elif mode in ("stop", "exit"):
             nox()
@@ -420,15 +428,20 @@ def attach_client():
         elif mode == "sessions":
             return run_sessions_gui(error_cb, options)
         elif mode == "launcher":
-            from xpra.client.gtk_base.client_launcher import main
-            return main(["xpra"]+args)
+            from xpra.client.gtk_base.client_launcher import main as launcher_main
+            return launcher_main(["xpra"]+args)
         elif mode == "gui":
-            from xpra.gtk_common.gui import main        #@Reimport
-            return main()
+            from xpra.gtk_common.gui import main as gui_main        #@Reimport
+            return gui_main()
         elif mode == "bug-report":
-            from xpra.scripts.bug_report import main    #@Reimport
-            main(["xpra"]+args)
-        elif mode in ("_proxy", "_proxy_start", "_proxy_start_desktop", "_shadow_start") and (supports_server or supports_shadow):
+            from xpra.scripts.bug_report import main as bug_main    #@Reimport
+            bug_main(["xpra"]+args)
+        elif mode in (
+            "_proxy",
+            "_proxy_start",
+            "_proxy_start_desktop",
+            "_shadow_start",
+            ) and (supports_server or supports_shadow):
             nox()
             return run_proxy(error_cb, options, script_file, args, mode, defaults)
         elif mode in ("_sound_record", "_sound_play", "_sound_query"):
@@ -1724,7 +1737,11 @@ def do_run_glcheck(opts):
         saved_level = logging.root.getEffectiveLevel()
         logging.root.setLevel(logging.WARN)
     try:
-        from xpra.client.gl.window_backend import get_opengl_backends, get_gl_client_window_module, test_gl_client_window
+        from xpra.client.gl.window_backend import (
+            get_opengl_backends,
+            get_gl_client_window_module,
+            test_gl_client_window,
+            )
         opengl_str = (opts.opengl or "").lower()
         force_enable = opengl_str.split(":")[0] in TRUE_OPTIONS
         backends = get_opengl_backends(opengl_str)
@@ -1947,7 +1964,8 @@ def get_start_server_args(opts, uid=getuid(), gid=getgid(), compat=False):
 
 def identify_new_socket(proc, dotxpra, existing_sockets, matching_display, new_server_uuid, display_name, matching_uid=0):
     log = get_util_logger()
-    log("identify_new_socket%s", (proc, dotxpra, existing_sockets, matching_display, new_server_uuid, display_name, matching_uid))
+    log("identify_new_socket%s",
+        (proc, dotxpra, existing_sockets, matching_display, new_server_uuid, display_name, matching_uid))
     #wait until the new socket appears:
     start = monotonic_time()
     UUID_PREFIX = "uuid="

src/xpra/server/proxy/proxy_instance_process.py

@@ -8,6 +8,7 @@
 import os
 import signal
 from threading import Timer, RLock
+from multiprocessing import Process
 from time import sleep
 
 from xpra.server.server_core import get_server_info, get_thread_info
@@ -38,7 +39,6 @@
 from xpra.server.socket_util import create_unix_domain_socket
 from xpra.platform.dotxpra import DotXpra
 from xpra.net.bytestreams import SocketConnection, SOCKET_TIMEOUT
-from multiprocessing import Process
 from xpra.log import Logger
 
 log = Logger("proxy")
@@ -58,9 +58,10 @@ def set_blocking(conn):
     #fails in mysterious ways, so we duplicate the code here instead
     log("set_blocking(%s)", conn)
     try:
-        log("calling %s.setblocking(1)", conn._socket)
-        conn._socket.setblocking(1)
-    except:
+        sock = conn._socket
+        log("calling %s.setblocking(1)", sock)
+        sock.setblocking(1)
+    except IOError:
         log("cannot set %s to blocking mode", conn)
 
 

src/xpra/server/server_core.py

@@ -788,7 +788,8 @@ def _new_connection(self, listener, *args):
             return True
         sockname = sock.getsockname()
         sock.settimeout(self._socket_timeout)
-        netlog("new_connection(%s) sock=%s, socket_info=%s, timeout=%s, address=%s, peername=%s. timeout=%s", args, sock, socket_info, self._socket_timeout, address, peername, self._socket_timeout)
+        netlog("new_connection(%s) sock=%s, socket_info=%s, timeout=%s, address=%s, peername=%s. timeout=%s",
+               args, sock, socket_info, self._socket_timeout, address, peername, self._socket_timeout)
         conn = SocketConnection(sock, sockname, address, peername, socktype)
 
         #from here on, we run in a thread, so we can poll (peek does)
@@ -1124,7 +1125,7 @@ def invalid_header(self, proto, data, msg=""):
     def guess_header_protocol(self, v):
         try:
             c = ord(v[0])
-        except:
+        except TypeError:
             c = int(v[0])
         netlog("guess_header_protocol(%s)", binascii.hexlify(strtobytes(v)))
         if c==0x16:
@@ -1166,7 +1167,8 @@ def start_http_socket(self, socktype, conn, is_ssl=False, peek_data=""):
         start_thread(self.start_http, "%s-for-%s" % (tname, frominfo), daemon=True, args=(socktype, conn, is_ssl, req_info, conn.remote))
 
     def start_http(self, socktype, conn, is_ssl, req_info, frominfo):
-        httplog("start_http(%s, %s, %s, %s, %s) www dir=%s, headers dir=%s", socktype, conn, is_ssl, req_info, frominfo, self._www_dir, self._http_headers_dir)
+        httplog("start_http(%s, %s, %s, %s, %s) www dir=%s, headers dir=%s",
+                socktype, conn, is_ssl, req_info, frominfo, self._www_dir, self._http_headers_dir)
         try:
             from xpra.net.websockets.handler import WebSocketRequestHandler
             sock = conn._socket