debug logging tweaks and pylint fixes

git-svn-id: https://xpra.org/svn/Xpra/trunk@21907 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Feb 28, 2019 · ba660c4 · ba660c4
1 parent 5e7742d
commit ba660c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/xpra/client/mixins/clipboard.py b/src/xpra/client/mixins/clipboard.py
@@ -104,8 +104,8 @@ def parse_server_capabilities(self):
         log("client clipboard: supported=%s, direction=%s",
                      self.client_supports_clipboard, self.client_clipboard_direction)
         self.clipboard_enabled = self.client_supports_clipboard and self.server_clipboard
-        self.server_clipboard_contents_slice_fix = c.boolget("clipboard.contents-slice-fix")
         log("parse_clipboard_caps() clipboard enabled=%s", self.clipboard_enabled)
+        self.server_clipboard_contents_slice_fix = c.boolget("clipboard.contents-slice-fix")
         if not self.server_clipboard_contents_slice_fix:
             log.info("server clipboard does not include contents slice fix")
         return True

diff --git a/src/xpra/dbus/notifications_forwarder.py b/src/xpra/dbus/notifications_forwarder.py
@@ -176,9 +176,9 @@ def register(notify_callback=None, close_callback=None, replace=False):
     if replace:
         flags |= dbus.bus.NAME_FLAG_REPLACE_EXISTING
     request = bus.request_name(BUS_NAME, flags)
+    log("notifications: bus name '%s', request=%s" % (BUS_NAME, request))
     if request==dbus.bus.REQUEST_NAME_REPLY_EXISTS:
         raise Exception("the name '%s' is already claimed on the session bus" % BUS_NAME)
-    log("notifications: bus name '%s', request=%s" % (BUS_NAME, request))
     return DBUSNotificationsForwarder(bus, notify_callback, close_callback)
 
 

diff --git a/src/xpra/server/mixins/clipboard_server.py b/src/xpra/server/mixins/clipboard_server.py
@@ -60,7 +60,8 @@ def get_info(self, _proto):
 
     def get_server_features(self, server_source=None):
         clipboard = self._clipboard_helper is not None
-        log("clipboard_helper=%s, clipboard_client=%s, source=%s, clipboard=%s", self._clipboard_helper, self._clipboard_client, server_source, clipboard)
+        log("clipboard_helper=%s, clipboard_client=%s, source=%s, clipboard=%s",
+            self._clipboard_helper, self._clipboard_client, server_source, clipboard)
         if not clipboard:
             return {}
         f = {