pylint intro

3 files changed, 28 insertions, 25 deletions

diff --git a/src/intro/colorpicker.py b/src/intro/colorpicker.py
index 90dbc26..a939857 100644
--- a/src/intro/colorpicker.py
+++ b/src/intro/colorpicker.py
@@ -24,6 +24,7 @@ class ColorPicker(hippo.CanvasBox, hippo.CanvasItem):
     def __init__(self, **kwargs):
         hippo.CanvasBox.__init__(self, **kwargs)
         self.props.orientation = hippo.ORIENTATION_HORIZONTAL
+        self._xo_color = None
 
         self._xo = CanvasIcon(size=style.XLARGE_ICON_SIZE,
                               icon_name='computer-xo')
diff --git a/src/intro/glive.py b/src/intro/glive.py
index a875e48..a2ddbae 100644
--- a/src/intro/glive.py
+++ b/src/intro/glive.py
@@ -4,7 +4,6 @@
 import gtk
 import pygtk
 pygtk.require('2.0')
-import sys
 
 import pygst
 pygst.require('0.10')
@@ -16,8 +15,12 @@ gobject.threads_init()
 
 class Glive(gobject.GObject):
     __gsignals__ = {
-        'new-picture': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
-        'sink': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT]))
+        'new-picture': (gobject.SIGNAL_RUN_FIRST,
+                        gobject.TYPE_NONE,
+                        ([gobject.TYPE_PYOBJECT])),
+        'sink'       : (gobject.SIGNAL_RUN_FIRST,
+                        gobject.TYPE_NONE,
+                        ([gobject.TYPE_PYOBJECT]))
     }
 
     def __init__(self, parent, width, height):
@@ -55,7 +58,8 @@ class Glive(gobject.GObject):
         self.queue.set_property("max-size-buffers", 1)
         self.qsrc = self.queue.get_pad( "src" )
         self.qsink = self.queue.get_pad("sink")
-        self.ffmpeg = gst.element_factory_make("ffmpegcolorspace", "ffmpegcolorspace")
+        self.ffmpeg = gst.element_factory_make( \
+                "ffmpegcolorspace", "ffmpegcolorspace")
         self.jpgenc = gst.element_factory_make("jpegenc", "jpegenc")
         self.filesink = gst.element_factory_make("fakesink", "fakesink")
         self.filesink.connect( "handoff", self.copyframe )
@@ -74,13 +78,13 @@ class Glive(gobject.GObject):
         self._CONNECT_MSG = -1
         self.doPostBusStuff()
 
-    def copyframe(self, fsink, buffer, pad, user_data=None):
+    def copyframe(self, fsink, buf, pad, user_data=None):
         #for some reason, we get two back to back buffers, even though we
         #ask for only one.
         if (self.exposureOpen):
             self.exposureOpen = False
             piccy = gtk.gdk.pixbuf_loader_new_with_mime_type("image/jpeg")
-            piccy.write( buffer )
+            piccy.write(buf)
             piccy.close()
             pixbuf = piccy.get_pixbuf()
             del piccy
@@ -103,7 +107,8 @@ class Glive(gobject.GObject):
     def doPostBusStuff(self):
         self._bus.enable_sync_message_emission()
         self._bus.add_signal_watch()
-        self._CONNECT_SYNC = self._bus.connect('sync-message::element', self.on_sync_message)
+        self._CONNECT_SYNC = self._bus.connect('sync-message::element',
+                                               self.on_sync_message)
         self._CONNECT_MSG = self._bus.connect('message', self.on_message)
 
     def on_sync_message(self, bus, message):
@@ -116,14 +121,11 @@ class Glive(gobject.GObject):
     def on_message(self, bus, message):
         t = message.type
         if (t == gst.MESSAGE_ERROR):
-            err, debug = message.parse_error()
             if (self.on_eos):
                 self.on_eos()
-                self._playing = False
         elif (t == gst.MESSAGE_EOS):
             if (self.on_eos):
                 self.on_eos()
-                self._playing = False
 
     def on_eos( self ):
         pass
@@ -140,7 +142,9 @@ class Glive(gobject.GObject):
 
 class LiveVideoSlot(gtk.EventBox):
     __gsignals__ = {
-        'pixbuf': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
+        'pixbuf': (gobject.SIGNAL_RUN_FIRST,
+                   gobject.TYPE_NONE,
+                   ([gobject.TYPE_PYOBJECT]))
     }
 
     def __init__(self, width, height):
diff --git a/src/intro/intro.py b/src/intro/intro.py
index b8c7a10..18092c3 100644
--- a/src/intro/intro.py
+++ b/src/intro/intro.py
@@ -15,12 +15,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
-from ConfigParser import ConfigParser
 from gettext import gettext as _
 
 import gtk
 import gobject
-import dbus
 import hippo
 import logging
 
@@ -127,6 +125,7 @@ class _IntroBox(hippo.CanvasBox):
         self._name_page = _NamePage(self)
         self._color_page = _ColorPage()
         self._current_page = None
+        self._next_button = None
 
         self._setup_page()
 
@@ -208,15 +207,6 @@ class _IntroBox(hippo.CanvasBox):
 
         self.emit('done', pixbuf, name, color)
 
-    def _key_press_cb(self, widget, event):
-        if gtk.gdk.keyval_name(event.keyval) == "Return":
-            self.next()
-            return True
-        elif gtk.gdk.keyval_name(event.keyval) == "Escape":
-            self.back()
-            return True
-        return False
-
 class IntroWindow(gtk.Window):
     def __init__(self):
         gtk.Window.__init__(self)
@@ -228,7 +218,7 @@ class IntroWindow(gtk.Window):
 
         self.add(self._canvas)
         self._canvas.show()
-        self.connect('key-press-event', self._intro_box._key_press_cb)
+        self.connect('key-press-event', self.__key_press_cb)
 
     def _done_cb(self, box, pixbuf, name, color):
         self.hide()
@@ -237,7 +227,6 @@ class IntroWindow(gtk.Window):
     def _create_profile(self, pixbuf, name, color):
         # Save the buddy icon
         icon_path = os.path.join(env.get_profile_path(), "buddy-icon.jpg")
-        scaled = pixbuf.scale_simple(200, 200, gtk.gdk.INTERP_BILINEAR)
         pixbuf.save(icon_path, "jpeg", {"quality":"85"})
 
         profile = get_profile()
@@ -252,13 +241,22 @@ class IntroWindow(gtk.Window):
             cmd = "ssh-keygen -q -t dsa -f %s -C '' -N ''" % keypath
             (s, o) = commands.getstatusoutput(cmd)
             if s != 0:
-                logging.error("Could not generate key pair: %d" % s)
+                logging.error("Could not generate key pair: %d %s" % (s, o))
         else:
             logging.error("Keypair exists, skip generation.")
 
         gtk.main_quit()
         return False
 
+    def __key_press_cb(self, widget, event):
+        if gtk.gdk.keyval_name(event.keyval) == "Return":
+            self._intro_box.next()
+            return True
+        elif gtk.gdk.keyval_name(event.keyval) == "Escape":
+            self._intro_box.back()
+            return True
+        return False
+
 
 if __name__ == "__main__":
     w = IntroWindow()