From f9bd9dd9b2405c29ad24c3dae5b50808a57c2008 Mon Sep 17 00:00:00 2001
From: souliane <souliane@mailoo.org>
Date: Thu, 5 Sep 2013 20:57:00 +0200
Subject: [PATCH] misc: a few "cosmetic" changes (PEP 8...)

---
 frontends/src/primitivus/chat.py                | 1 +
 frontends/src/primitivus/notify.py              | 5 +++--
 frontends/src/primitivus/primitivus             | 1 -
 frontends/src/quick_frontend/quick_chat_list.py | 2 +-
 frontends/src/wix/chat.py                       | 8 ++++----
 src/plugins/plugin_xep_0047.py                  | 3 ++-
 src/plugins/plugin_xep_0065.py                  | 3 ++-
 src/plugins/plugin_xep_0096.py                  | 3 ++-
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/frontends/src/primitivus/chat.py b/frontends/src/primitivus/chat.py
index 9837e496..c1590d90 100644
--- a/frontends/src/primitivus/chat.py
+++ b/frontends/src/primitivus/chat.py
@@ -71,6 +71,7 @@ class ChatText(urwid.FlowWidget):
         render_txt.append(self.message)
         return urwid.Text(render_txt, align=self.align)
 
+
 class Chat(urwid.WidgetWrap, QuickChat):
 
     def __init__(self, target, host, type='one2one'):
diff --git a/frontends/src/primitivus/notify.py b/frontends/src/primitivus/notify.py
index 798f91eb..077959c8 100644
--- a/frontends/src/primitivus/notify.py
+++ b/frontends/src/primitivus/notify.py
@@ -43,7 +43,6 @@ class Notify(object):
         except:
             self.freedesktop_int = None
 
-
     def getFocus(self):
         if not self.display:
             return 0
@@ -73,4 +72,6 @@ class Notify(object):
             hints = dbus.Dictionary(signature='sv')
             expire_timeout = -1
 
-            self.freedesktop_int.Notify(app_name, replaces_id, app_icon, summary, body, actions, hints, expire_timeout)
+            self.freedesktop_int.Notify(app_name, replaces_id, app_icon,
+                                        summary, body, actions,
+                                        hints, expire_timeout)
diff --git a/frontends/src/primitivus/primitivus b/frontends/src/primitivus/primitivus
index 8c4b636f..ca2c6343 100755
--- a/frontends/src/primitivus/primitivus
+++ b/frontends/src/primitivus/primitivus
@@ -614,4 +614,3 @@ class PrimitivusApp(QuickApp):
 
 sat = PrimitivusApp()
 sat.start()
-
diff --git a/frontends/src/quick_frontend/quick_chat_list.py b/frontends/src/quick_frontend/quick_chat_list.py
index a2079039..271cbad8 100644
--- a/frontends/src/quick_frontend/quick_chat_list.py
+++ b/frontends/src/quick_frontend/quick_chat_list.py
@@ -33,7 +33,7 @@ class QuickChatList(dict):
         if not self.has_key(target.short):
             #we have to create the chat win
             self[target.short] = self.createChat(target)
-        return dict.__getitem__(self,target.short)
+        return dict.__getitem__(self, target.short)
 
     def createChat(self, target):
         raise NotImplementedError
diff --git a/frontends/src/wix/chat.py b/frontends/src/wix/chat.py
index 8f122731..98c6936e 100644
--- a/frontends/src/wix/chat.py
+++ b/frontends/src/wix/chat.py
@@ -199,10 +199,10 @@ class Chat(wx.Frame, QuickChat):
 
     def onEnterPressed(self, event):
         """Behaviour when enter pressed in send line."""
-        self.host.sendMessage(self.target.short if self.type=='group' else self.target,
-                                     event.GetString(),
-                                     mess_type = "groupchat" if self.type=='group' else "chat",
-                                     profile_key=self.host.profile)
+        self.host.sendMessage(self.target.short if self.type == 'group' else self.target,
+                              event.GetString(),
+                              mess_type="groupchat" if self.type == 'group' else "chat",
+                              profile_key=self.host.profile)
         self.textBox.Clear()
 
     def __blink(self):
diff --git a/src/plugins/plugin_xep_0047.py b/src/plugins/plugin_xep_0047.py
index 65d0e266..1950e0af 100644
--- a/src/plugins/plugin_xep_0047.py
+++ b/src/plugins/plugin_xep_0047.py
@@ -75,7 +75,8 @@ class XEP_0047(object):
     def _timeOut(self, sid, profile):
         """Delecte current_stream id, called after timeout
         @param id: id of client.xep_0047_current_stream"""
-        info(_("In-Band Bytestream: TimeOut reached for id %s [%s]") % (sid, profile))
+        info(_("In-Band Bytestream: TimeOut reached for id %(sid)s [%(profile)s]")
+             % {"sid": sid, "profile": profile})
         self._killId(sid, False, "TIMEOUT", profile)
 
     def _killId(self, sid, success=False, failure_reason="UNKNOWN", profile=None):
diff --git a/src/plugins/plugin_xep_0065.py b/src/plugins/plugin_xep_0065.py
index e9fee44b..d5e9acb6 100755
--- a/src/plugins/plugin_xep_0065.py
+++ b/src/plugins/plugin_xep_0065.py
@@ -503,7 +503,8 @@ class XEP_0065(object):
     def _timeOut(self, sid, profile):
         """Delecte current_stream id, called after timeout
         @param id: id of client.xep_0065_current_stream"""
-        info(_("Socks5 Bytestream: TimeOut reached for id %s [%s]") % (sid, profile))
+        info(_("Socks5 Bytestream: TimeOut reached for id %(sid)s [%(profile)s]")
+             % {"sid": sid, "profile": profile})
         self._killId(sid, False, "TIMEOUT", profile)
 
     def _killId(self, sid, success=False, failure_reason="UNKNOWN", profile=None):
diff --git a/src/plugins/plugin_xep_0096.py b/src/plugins/plugin_xep_0096.py
index 8cfe26a9..86aa92ba 100755
--- a/src/plugins/plugin_xep_0096.py
+++ b/src/plugins/plugin_xep_0096.py
@@ -295,7 +295,8 @@ class XEP_0096(object):
         return sid
 
     def sendSuccessCb(self, sid, file_obj, stream_method, profile):
-        info(_('Transfer %s successfuly finished [%s]') % (sid, profile))
+        info(_('Transfer %(sid)s successfuly finished [%(profile)s]')
+             % {"sid": sid, "profile": profile})
         file_obj.close()
 
     def sendFailureCb(self, sid, file_obj, stream_method, reason, profile):