From 4e2df4e10931eac04393c3cc8abe99953b17dcc6 Mon Sep 17 00:00:00 2001
From: Daniel Francis <francis@sugarlabs.org>
Date: Fri, 29 Jun 2012 21:25:58 +0000
Subject: A lot of pep8 corrections

I'm porting Speak Activity to Gtk3, this patch is the first step.
I have these pending steps to do:
. Remove the toolkit modules and migrate the activity to sugar-toolkit
. Migrate from Hippo to Gtk
. Convert the activity to PyGI; Gtk3 Port Start
. Use gi.repository.Gst in the place of pygst
. Extra corrections; Finishing port

Signed-off-by: Daniel Francis <francis@sugarlabs.org>
---
(limited to 'messenger.py')

diff --git a/messenger.py b/messenger.py
index 14151e5..eb03bda 100644
--- a/messenger.py
+++ b/messenger.py
@@ -28,6 +28,7 @@ SERVICE = 'org.sugarlabs.Speak'
 IFACE = SERVICE
 PATH = '/org/sugarlabs/Speak'
 
+
 class Messenger(ExportedGObject):
     def __init__(self, tube, is_initiator, chat):
         ExportedGObject.__init__(self, tube, PATH)
@@ -61,10 +62,16 @@ class Messenger(ExportedGObject):
             if not self._entered:
                 self.me = self._tube.get_unique_name()
 
-                self._tube.add_signal_receiver(self._ping_cb, '_ping', IFACE, path=PATH,
-                        sender_keyword='sender')
-                self._tube.add_signal_receiver(self._post_cb, '_post', IFACE, path=PATH,
-                        sender_keyword='sender')
+                self._tube.add_signal_receiver(self._ping_cb,
+                                               '_ping',
+                                               IFACE,
+                                               path=PATH,
+                                               sender_keyword='sender')
+                self._tube.add_signal_receiver(self._post_cb,
+                                               '_post',
+                                               IFACE,
+                                               path=PATH,
+                                               sender_keyword='sender')
 
                 if not self.is_initiator:
                     self._ping(self.chat.me.status.serialize())
@@ -97,7 +104,8 @@ class Messenger(ExportedGObject):
 
         tp_handle = self._tube.bus_name_to_handle[sender]
         buddy = self._tube.get_buddy(tp_handle)
-        if not buddy: return
+        if not buddy:
+            return
         self._buddies[tp_handle] = buddy
 
         logger.debug('ping received from %s(%s) status=%s' \
@@ -116,7 +124,7 @@ class Messenger(ExportedGObject):
         tp_handle = self._tube.bus_name_to_handle[sender]
         buddy = self._buddies[tp_handle]
 
-        logger.debug('message received from %s(%s): %s' 
+        logger.debug('message received from %s(%s): %s'
                 % (sender, buddy.props.nick, text))
 
         self.chat.post(buddy, face.Status().deserialize(sender_status), text)
--
cgit v0.9.1