Merge lp:~dobey/ubuntu/natty/rhythmbox-ubuntuone-music-store/use-defer into lp:ubuntu/natty/rhythmbox-ubuntuone-music-store

[dobey]

=== removed file 'MANIFEST'
--- MANIFEST	2010-08-26 01:47:45 +0000
+++ MANIFEST	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-COPYING
-MANIFEST
-MANIFEST.in
-README
-setup.cfg
-setup.py
-po/POTFILES.in
-po/ca.po
-po/cs.po
-po/da.po
-po/de.po
-po/el.po
-po/en_GB.po
-po/es.po
-po/eu.po
-po/fi.po
-po/fr.po
-po/fy.po
-po/gl.po
-po/he.po
-po/hr.po
-po/ka.po
-po/nl.po
-po/pl.po
-po/rhythmbox-ubuntuone-music-store.pot
-po/ro.po
-po/ru.po
-po/sv.po
-po/uk.po
-umusicstore/MusicStoreWidget.py
-umusicstore/U1MSLinks.py
-umusicstore/__init__.py
-umusicstore/empty.mp3
-umusicstore/u1msurl.glade
-umusicstore/umusicstore.rb-plugin
-umusicstore/umusicstore.rb-plugin.in

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-07-21 16:03:11 +0000
+++ MANIFEST.in	2010-12-21 15:44:57 +0000
@@ -1,10 +1,5 @@
-include COPYING README
-include MANIFEST.in MANIFEST
-include po/*
-include umusicstore/umusicstore.rb-plugin*
-include umusicstore/empty.mp3
-include umusicstore/musicstore_icon.png
-include umusicstore/__init__.py
-include umusicstore/MusicStoreWidget.py
-include umusicstore/U1MSLinks.py
-include umusicstore/u1msurl.glade
+include COPYING MANIFEST.in README
+include run-tests rb.py rhythmdb.py
+recursive-include gst *.py
+recursive-include po *.po POTFILES.in
+recursive-include umusicstore *.py *.glade *.mp3 *.rb-plugin.in

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-10-07 13:09:46 +0000
+++ PKG-INFO	2010-12-21 15:44:57 +0000
@@ -1,11 +1,13 @@
 Metadata-Version: 1.1
 Name: rhythmbox-ubuntuone-music-store
-Version: 0.1.9
-Summary: Ubuntu One Music Store Rhythmbox plugin
+Version: 0.1.10
+Summary: Ubuntu One Music Store Rhythmbox plug-in
 Home-page: https://launchpad.net/rhythmbox-ubuntuone-music-store
 Author: Stuart Langridge
 Author-email: [e-mail]
 License: LGPL v3
-Description: A Rhythmbox plugin that makes the Ubuntu Music Store available in Rhythmbox.
+Description: A plug-in to access the Ubuntu One Music Store in Rhythmbox.
 Platform: UNKNOWN
-Requires: DistUtilsExtra.auto
+Provides: gst
+Provides: rb
+Provides: rhythmdb

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-21 10:32:15 +0000
+++ debian/changelog	2010-12-21 15:44:57 +0000
@@ -1,3 +1,10 @@
+rhythmbox-ubuntuone-music-store (0.1.10-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    - Handle the defer API being split out from aptdaemon. (LP: #691647)
+
+ -- Rodney Dawes <[e-mail]>  Tue, 21 Dec 2010 10:37:55 -0500
+
 rhythmbox-ubuntuone-music-store (0.1.9-0ubuntu2) natty; urgency=low
 
   * debian/control: add Depends on python-defer (LP: #691647)

=== added directory 'gst'
=== added file 'gst/__init__.py'
--- gst/__init__.py	1970-01-01 00:00:00 +0000
+++ gst/__init__.py	2010-12-21 15:44:57 +0000
@@ -0,0 +1,14 @@
+"""Fake gst.py module for testing."""
+
+STATE_NULL = 0
+STATE_PLAYING = 1
+
+
+def parse_launch(*args, **kwargs):
+    """Fake parse_launch."""
+    return
+
+
+def update_registry(*args, **kwargs):
+    """Fake update_registry."""
+    return

=== added file 'gst/pbutils.py'
--- gst/pbutils.py	1970-01-01 00:00:00 +0000
+++ gst/pbutils.py	2010-12-21 15:44:57 +0000
@@ -0,0 +1,6 @@
+"""Fake pbutils module for testing."""
+
+
+def is_missing_plugin_message(*args, **kwargs):
+    """Fake is_missing_plugin_message."""
+    return

=== removed file 'po/rhythmbox-ubuntuone-music-store.pot'
--- po/rhythmbox-ubuntuone-music-store.pot	2010-04-01 17:30:54 +0000
+++ po/rhythmbox-ubuntuone-music-store.pot	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-25 10:30+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Translators: this is the name under Music for U1 music in Rhythmbox
-#: ../umusicstore/__init__.py:172
-msgid "Purchased from Ubuntu One"
-msgstr ""
-
-#: ../umusicstore/__init__.py:243
-msgid "Ubuntu One"
-msgstr ""
-
-#: ../umusicstore/__init__.py:288
-msgid "MP3 plugins are not installed"
-msgstr ""
-
-#: ../umusicstore/__init__.py:293
-msgid ""
-"To listen to your purchased songs, you need to install MP3 plugins. Click "
-"below to install them."
-msgstr ""
-
-#: ../umusicstore/__init__.py:298
-msgid "Install MP3 plugins"
-msgstr ""
-
-#: ../umusicstore/__init__.py:320
-msgid "Installing MP3 plugins"
-msgstr ""
-
-#: ../umusicstore/__init__.py:340
-msgid "There was a problem installing, sorry"
-msgstr ""
-
-#: ../umusicstore/__init__.py:343
-msgid "Check your internet connection and try again."
-msgstr ""
-
-#: ../umusicstore/umusicstore.rb-plugin.in.h:1
-msgid "The Ubuntu One Music Store"
-msgstr ""
-
-#: ../umusicstore/umusicstore.rb-plugin.in.h:2
-msgid "Ubuntu One Music Store"
-msgstr ""

=== added file 'rb.py'
--- rb.py	1970-01-01 00:00:00 +0000
+++ rb.py	2010-12-21 15:44:57 +0000
@@ -0,0 +1,36 @@
+"""Fake rb.py for use in testing."""
+
+SOURCE_GROUP_CATEGORY_FIXED = 0
+
+
+class Plugin(object):
+    """Fake Plugin class for testing."""
+
+    def __init__(self, *args, **kwargs):
+        super(Plugin, self).__init__()
+
+    def find_file(self, *args, **kwargs):
+        """Fake find_file method."""
+        pass
+
+
+class Source(object):
+    """Fake Source class for testing."""
+
+    add = __fake_it
+    remove = __fake_it
+    show_all = __fake_it
+    do_impl_activate = __fake_it
+
+    def __fake_it(self, *args, **kwargs):
+        """Fake method."""
+
+
+def rb_source_group_get_by_name(*args, **kwargs):
+    """Fake method."""
+    return
+
+
+def rb_source_group_register(*args, **kwargs):
+    """Fake method."""
+    return

=== added file 'rhythmdb.py'
--- rhythmdb.py	1970-01-01 00:00:00 +0000
+++ rhythmdb.py	2010-12-21 15:44:57 +0000
@@ -0,0 +1,12 @@
+"""Fake rhythmdb.py for use in testing."""
+
+PROP_ARTIST = 0
+PROP_TITLE = 1
+PROP_ALBUM = 2
+
+
+class EntryType(object):
+    """Fake EntryType object."""
+
+    def __init__(self, *args, **kwargs):
+        super(EntryType, self).__init__()

=== added file 'run-tests'
--- run-tests	1970-01-01 00:00:00 +0000
+++ run-tests	2010-12-21 15:44:57 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Author: Natalia Bidart <[e-mail]>
+#
+# Copyright 2010 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+export PYTHONPATH=umusicstore
+u1lint .
+if [ -x `which pep8` ]; then
+    pep8 --repeat .
+else
+    echo "Please install the 'pep8' package."
+fi
+rm -rf _trial_temp

=== modified file 'setup.py' (properties changed: -x to +x)
--- setup.py	2010-10-07 13:09:46 +0000
+++ setup.py	2010-12-21 15:44:57 +0000
@@ -1,18 +1,22 @@
+#!/usr/bin/python
+"""Setup script for Ubuntu One Music Store plug-in for Rhythmbox."""
 
 import DistUtilsExtra.auto
 
 DistUtilsExtra.auto.setup(
     name='rhythmbox-ubuntuone-music-store',
-    version='0.1.9',
+    version='0.1.10',
     license='LGPL v3',
     author='Stuart Langridge',
     author_email='[e-mail]',
-    description='Ubuntu One Music Store Rhythmbox plugin',
-    long_description='A Rhythmbox plugin that makes the Ubuntu Music Store available in Rhythmbox.',
+    description='Ubuntu One Music Store Rhythmbox plug-in',
+    long_description=('A plug-in to access the Ubuntu One Music Store '
+                      'in Rhythmbox.'),
     url='https://launchpad.net/rhythmbox-ubuntuone-music-store',
-    data_files = [('/usr/lib/rhythmbox/plugins/umusicstore', ['umusicstore/__init__.py',
-                                                              'umusicstore/empty.mp3',
-                                                              'umusicstore/MusicStoreWidget.py',
-                                                              'umusicstore/U1MSLinks.py',
-                                                              'umusicstore/u1msurl.glade'])],
+    data_files=[('/usr/lib/rhythmbox/plugins/umusicstore',
+                 ['umusicstore/__init__.py',
+                  'umusicstore/empty.mp3',
+                  'umusicstore/MusicStoreWidget.py',
+                  'umusicstore/U1MSLinks.py',
+                  'umusicstore/u1msurl.glade'])],
     )

=== modified file 'umusicstore/MusicStoreWidget.py'
--- umusicstore/MusicStoreWidget.py	2010-10-07 13:09:46 +0000
+++ umusicstore/MusicStoreWidget.py	2010-12-21 15:44:57 +0000
@@ -16,39 +16,59 @@
 #
 # Authored by Stuart Langridge <[e-mail]>
 
- 
-import gtk, gobject, os, urllib, gconf, stat, urlparse, gio
-import gst, gst.pbutils
+# pylint: disable=W0201
+
+# Import these here as gtk/gio import ordering seems to matter
+import gobject
+import gtk
+import gio
+
 import aptdaemon.client
-from aptdaemon import policykit1
-from aptdaemon.defer import inline_callbacks
-from aptdaemon.enums import *
-from aptdaemon.gtkwidgets import AptErrorDialog, \
-                                 AptProgressBar
-from commands import getstatusoutput
-import rb, rhythmdb
-from ubuntuone.gtkwidgets import MusicStore as U1MusicStore
-import xdg.BaseDirectory
 import dbus
 import dbus.exceptions
-
+import gconf
 import gettext
+import gst
+import gst.pbutils
+import os
+# pylint: disable=F0401
+import rb
+import rhythmdb
+# pylint: enable=F0401
+import stat
+import urllib
+import urlparse
+import xdg.BaseDirectory
+
+from aptdaemon import policykit1
+try:
+    from aptdaemon.defer import inline_callbacks
+except ImportError:
+    from defer import inline_callbacks
+from aptdaemon.enums import EXIT_SUCCESS
+from aptdaemon.gtkwidgets import AptProgressBar
 from gettext import lgettext as _
+from ubuntuone.gtkwidgets import MusicStore as U1MusicStore
+
 gettext.bindtextdomain("rhythmbox-ubuntuone-music-store", "/usr/share/locale")
 gettext.textdomain("rhythmbox-ubuntuone-music-store")
 
-MUSIC_STORE_WIDGET = U1MusicStore() # keep this around for later
+MUSIC_STORE_WIDGET = U1MusicStore()  # keep this around for later
 U1LIBRARYPATH = MUSIC_STORE_WIDGET.get_library_location()
 RB_LIBRARY_LOCATIONS = "/apps/rhythmbox/library_locations"
 PARTNER_LIST = "canonical-partner-maverick.list"
 SOURCES_DIR = "/etc/apt/sources.list.d/"
 PLUGIN_PACKAGENAME = "gstreamer0.10-fluendo-plugins-mp3-partner"
 
+
 class U1EntryType(rhythmdb.EntryType):
+    """Entry type for the Ubuntu One Music Store source."""
+
     def __init__(self):
         rhythmdb.EntryType.__init__(self, name='ubuntuone')
 
     def can_sync_metadata(self, entry):
+        """Not a real source, so we can't sync metadata."""
         return False
 
 
@@ -57,37 +77,37 @@
     def __init__(self, plugin, find_file):
         self.plugin = plugin
         self.find_file = find_file
-    
+
     def activate(self, shell):
         """Plugin startup."""
         self.db = shell.get_property("db")
-        group = rb.rb_source_group_get_by_name ("stores")
+        group = rb.rb_source_group_get_by_name("stores")
         if not group:
-            group = rb.rb_source_group_register ("stores",
-                                           "Stores",
-                                           rb.SOURCE_GROUP_CATEGORY_FIXED)
-        
+            group = rb.rb_source_group_register("stores",
+                                                "Stores",
+                                                rb.SOURCE_GROUP_CATEGORY_FIXED)
+
         icon = gtk.IconTheme().load_icon(
             "ubuntuone", gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)[0], 0)
 
         self.entry_type = U1EntryType()
         self.db.register_entry_type(self.entry_type)
 
-        self.source = gobject.new (U1Source,
-                                   shell=shell,
-                                   entry_type=self.entry_type,
-                                   source_group=group,
-                                   icon=icon,
-                                   plugin=self.plugin)
+        self.source = gobject.new(U1Source,
+                                  shell=shell,
+                                  entry_type=self.entry_type,
+                                  source_group=group,
+                                  icon=icon,
+                                  plugin=self.plugin)
         shell.register_entry_type_for_source(self.source, self.entry_type)
         self.shell = shell
         self.source.connect("preview-mp3", self.play_preview_mp3)
         self.source.connect("play-library", self.play_library)
         self.source.connect("download-finished", self.download_finished)
         self.source.connect("url-loaded", self.url_loaded)
-            
+
         # Do these every time
-        shell.append_source(self.source, None) # Add the source to the list
+        shell.append_source(self.source, None)  # Add the source to the list
         self.add_u1_library()
 
     def deactivate(self, shell):
@@ -96,18 +116,20 @@
         self.source.delete_thyself()
         # remove the library, if it's empty
         try:
-            filecount = len(os.listdir(self.U1_LIBRARY_SYMLINK))
+            filecount = len(os.listdir(self.u1_library_symlink))
         except OSError:
             # symlink is dangling
             # so they never downloaded anything
             filecount = 0
         if filecount == 0:
             client = gconf.client_get_default()
-            libraries = client.get_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING)
+            libraries = client.get_list(RB_LIBRARY_LOCATIONS,
+                                        gconf.VALUE_STRING)
             if self.u1_library_path_url in libraries:
                 client.notify_remove(self.library_adder)
                 libraries.remove(self.u1_library_path_url)
-                client.set_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING, libraries)
+                client.set_list(RB_LIBRARY_LOCATIONS,
+                                gconf.VALUE_STRING, libraries)
         # delete held references
         del self.db
         del self.source
@@ -116,24 +138,24 @@
     def url_loaded(self, source, url):
         """A URL is loaded in the plugin"""
         print "URL loaded:", url
-        if urlparse.urlparse(url).scheme == "https":
+        if urlparse.urlparse(url)[2] == "https":
             pass
         else:
             pass
-    
+
     def _udf_path_to_library_uri(self, path):
-        """Calculate the path in the library. 
-        Since the library is accessed via the created symlink, but the path 
-        passed to us is to a file in the actual music store UDF, we need to 
+        """Calculate the path in the library.
+        Since the library is accessed via the created symlink, but the path
+        passed to us is to a file in the actual music store UDF, we need to
         work out the path inside the library, i.e., what the path to that file
         is via the symlink."""
-        
         if path.startswith(U1LIBRARYPATH):
             subpath = path[len(U1LIBRARYPATH):]
         else:
             subpath = path
-        if subpath.startswith("/"): subpath = subpath[1:]
-        library_path = os.path.join(self.U1_LIBRARY_SYMLINK, subpath)
+        if subpath.startswith("/"):
+            subpath = subpath[1:]
+        library_path = os.path.join(self.u1_library_symlink, subpath)
         # convert path to URI. Don't use urllib for this; Python and
         # glib escape URLs differently. gio does it the glib way.
         library_uri = gio.File(library_path).get_uri()
@@ -150,11 +172,11 @@
         """Switch to and start playing a song from the library"""
         uri = self._udf_path_to_library_uri(path)
         entry = self.shell.props.db.entry_lookup_by_location(uri)
-        if not entry: 
+        if not entry:
             print "couldn't find entry", uri
             return
         libsrc = self.shell.props.library_source
-        genre_view, artist_view, album_view = libsrc.get_property_views()
+        artist_view, album_view = libsrc.get_property_views()[0:]
         song_view = libsrc.get_entry_view()
         artist = self.shell.props.db.entry_get(entry, rhythmdb.PROP_ARTIST)
         album = self.shell.props.db.entry_get(entry, rhythmdb.PROP_ALBUM)
@@ -177,7 +199,7 @@
         player = self.shell.get_player()
         player.stop()
         player.play_entry(entry, self.source)
-        # FIXME delete this entry when it finishes playing. Don't know how yet.
+        # delete this entry when it finishes playing. Don't know how yet.
 
     def add_u1_library(self):
         """Add the U1 library if not listed in RB and re-add if changed."""
@@ -187,11 +209,12 @@
         os.chmod(u1_library_path_folder,
             os.stat(u1_library_path_folder)[stat.ST_MODE] | stat.S_IWUSR)
         # Translators: this is the name under Music for U1 music in Rhythmbox
-        u1_library_path = os.path.join(u1_library_path_folder, _("Purchased from Ubuntu One"))
+        u1_library_path = os.path.join(u1_library_path_folder,
+                                       _("Purchased from Ubuntu One"))
         if not os.path.islink(u1_library_path):
             if not os.path.exists(u1_library_path):
-                print "Attempting to symlink %s to %s" % (U1LIBRARYPATH, 
-                    u1_library_path)
+                print "Attempting to symlink %s to %s" % (U1LIBRARYPATH,
+                                                          u1_library_path)
                 os.symlink(U1LIBRARYPATH, u1_library_path)
             else:
                 # something that isn't a symlink already exists. That's not
@@ -204,12 +227,13 @@
                     "delete or rename %s.") % (u1_library_path, U1LIBRARYPATH,
                     u1_library_path)
         self.u1_library_path_url = "file://%s" % urllib.quote(u1_library_path)
-        self.U1_LIBRARY_SYMLINK = u1_library_path
+        self.u1_library_symlink = u1_library_path
         client = gconf.client_get_default()
         self._add_u1_library_if_not_present(client)
         self._remove_old_u1_library_if_present(client)
         # Watch for changes to the gconf key and re-add the library
-        self.library_adder = client.notify_add(RB_LIBRARY_LOCATIONS, 
+        self.library_adder = client.notify_add(
+            RB_LIBRARY_LOCATIONS,
             self._add_u1_library_if_not_present)
 
     def _add_u1_library_if_not_present(self, client, *args, **kwargs):
@@ -217,7 +241,8 @@
         libraries = client.get_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING)
         if self.u1_library_path_url not in libraries:
             libraries.append(self.u1_library_path_url)
-            client.set_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING, libraries)
+            client.set_list(RB_LIBRARY_LOCATIONS,
+                            gconf.VALUE_STRING, libraries)
 
     def _remove_old_u1_library_if_present(self, client, *args, **kwargs):
         """Check for the old U1 library and remove it from libraries list."""
@@ -243,46 +268,57 @@
         # created under one name (say, English) and then had it created
         # under another (say, after a translation to Dutch)
         u1_library_path_folder = xdg.BaseDirectory.save_data_path("ubuntuone")
-        u1_library_path_folder_url = "file://%s" % urllib.quote(u1_library_path_folder)
-        symlink_url = "file://" + urllib.quote(self.U1_LIBRARY_SYMLINK)
-        for l in libraries:
-            if l.startswith(u1_library_path_folder_url) and l != symlink_url:
-                libraries.remove(l)
+        u1_library_path_folder_url = "file://%s" % urllib.quote(
+            u1_library_path_folder)
+        symlink_url = "file://" + urllib.quote(self.u1_library_symlink)
+        for lib in libraries:
+            if lib.startswith(u1_library_path_folder_url) and \
+                    lib != symlink_url:
+                libraries.remove(lib)
                 # and delete the symlink itself
-                symlink_to_remove = urllib.unquote(l[7:])
+                symlink_to_remove = urllib.unquote(lib[7:])
                 os.unlink(symlink_to_remove)
                 removed = True
         if removed:
-            client.set_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING, libraries)
-
-class U1Source(rb.Source):
+            client.set_list(RB_LIBRARY_LOCATIONS,
+                            gconf.VALUE_STRING, libraries)
+
+
+class U1Source(rb.Source, gobject.GObject):
     """A Rhythmbox source widget for the U1 Music Store."""
     # gproperties required so that rb.Source is instantiable
     __gproperties__ = {
-      'plugin': (rb.Plugin, 'plugin', 'plugin', 
-                    gobject.PARAM_WRITABLE|gobject.PARAM_CONSTRUCT_ONLY),
-    }
-    # we have the preview-mp3 signal; we receive it from the widget, and re-emit
-    # it so that the plugin gets it, because the plugin actually plays the mp3
+      'plugin': (rb.Plugin, 'plugin', 'plugin',
+                 gobject.PARAM_WRITABLE | gobject.PARAM_CONSTRUCT_ONLY),
+      }
+    # we have the preview-mp3 signal; we receive it from the widget, and
+    # re-emit it so that the plugin gets it, because the plugin actually
+    # plays the mp3
     __gsignals__ = {
-      "preview-mp3": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (str, str)),
-      "play-library": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (str,)),
-      "download-finished": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (str,)),
-      "url-loaded": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (str,)),
+      "preview-mp3": (gobject.SIGNAL_RUN_FIRST,
+                      gobject.TYPE_NONE, (str, str)),
+      "play-library": (gobject.SIGNAL_RUN_FIRST,
+                       gobject.TYPE_NONE, (str,)),
+      "download-finished": (gobject.SIGNAL_RUN_FIRST,
+                            gobject.TYPE_NONE, (str,)),
+      "url-loaded": (gobject.SIGNAL_RUN_FIRST,
+                     gobject.TYPE_NONE, (str,)),
     }
-    
+
     def __init__(self):
         rb.Source.__init__(self, name=_("Ubuntu One"))
+        gobject.GObject.__init__(self)
         self.browser = MUSIC_STORE_WIDGET
         self.__activated = False
 
     def do_impl_activate(self):
         """Source startup."""
-        if self.__activated: return
+        if self.__activated:
+            return
         self.__activated = True
         self.test_can_play_mp3()
-        rb.Source.do_impl_activate (self)
-    
+        rb.Source.do_impl_activate(self)
+
     def do_impl_want_uri(self, uri):
         """I want to handle u1ms URLs"""
         if uri.startswith("u1ms://"):
@@ -326,7 +362,7 @@
         """Handler for end of stream from the check-mp3 pipeline.
            If we reach the end of the stream, mp3 playback is enabled."""
         self.install_pipeline.set_state(gst.STATE_NULL)
-        if os.environ.has_key("U1INSTALLMP3ANYWAY"):
+        if os.environ.get("U1INSTALLMP3ANYWAY", None) is not None:
             # override the decision not to install the package
             self.install_mp3_playback()
         else:
@@ -349,7 +385,7 @@
         self.install_label_body.set_alignment(0.0, 0.5)
         self.install_label_eula = gtk.Label()
         # EULA text copied from
-        # /var/lib/dpkg/info/gstreamer0.10-fluendo-plugins-mp3-partner.templates
+        # gstreamer0.10-fluendo-plugins-mp3-partner.templates
         # The partner package shows the EULA itself on installations, but
         #  aptdaemon installations work like DEBIAN_FRONTEND=noninteractive
         # so we show the EULA here. (This also avoids a popup window.)
@@ -365,7 +401,7 @@
             "unless the seller has received a license by Fraunhofer IIS"
             "and Thomson and pay the relevant royalties to them.</small>")
         self.install_label_eula.set_alignment(0.0, 0.5)
-        self.install_label_eula.set_size_request(400,200)
+        self.install_label_eula.set_size_request(400, 200)
         self.install_label_eula.set_line_wrap(True)
         self.install_hbtn = gtk.HButtonBox()
         self.install_hbtn.set_layout(gtk.BUTTONBOX_END)
@@ -403,11 +439,10 @@
                 dist="maverick",
                 comps=["partner"],
                 comment="added by U1MusicStoreWidget",
-                sourcesfile=PARTNER_LIST, defer=True)
+                sourcesfile=PARTNER_LIST)
             yield trans.run(defer=True)
             trans = yield self.ac.update_cache(sources_list=SOURCES_DIR
-                                               + PARTNER_LIST,
-                                               defer=True)
+                                               + PARTNER_LIST)
             self.update_progress = AptProgressBar(trans)
             self.update_progress.show()
             self.install_label_head.set_text("")
@@ -417,7 +452,7 @@
             self.install_vbox.pack_start(self.update_progress, expand=False)
             trans.connect("finished", self._package_update_finished)
             yield trans.run(defer=True)
-        except Exception, e:
+        except Exception, e:  # pylint: disable=W0703
             self._on_error(e)
 
     @inline_callbacks
@@ -428,8 +463,7 @@
             self._on_error(transaction)
             return
         try:
-            trans = yield self.ac.install_packages([PLUGIN_PACKAGENAME],
-                                                   defer=True)
+            trans = yield self.ac.install_packages([PLUGIN_PACKAGENAME])
             self.install_progress = AptProgressBar(transaction)
             self.install_progress.show()
             self.install_label_head.set_text("")
@@ -439,7 +473,7 @@
             self.install_vbox.pack_start(self.install_progress, expand=False)
             trans.connect("finished", self._package_install_finished)
             yield trans.run(defer=True)
-        except Exception, e:
+        except Exception, e:  # pylint: disable=W0703
             self._on_error(e)
 
     def _package_install_finished(self, trans, exit_code):
@@ -449,7 +483,8 @@
             gst.update_registry()
             self.add_music_store_widget()
         else:
-            self._on_error("Could not find the %r package" % PLUGIN_PACKAGENAME)
+            self._on_error(
+                "Could not find the %r package" % PLUGIN_PACKAGENAME)
 
     def _on_error(self, error):
         """Error handler for aptdaemon."""
@@ -457,10 +492,10 @@
         problem_installing = _("There was a problem installing, sorry")
         self.install_label_head.set_markup('<span weight="bold" size="larger">'
             '%s</span>' % problem_installing)
-        self.install_label_body.set_text(_('Check your internet connection and '
-            'try again.'))
-        for widget in ("install_progress", "update_progress"):
-            widget = getattr(self, widget, None)
+        self.install_label_body.set_text(_('Check your internet connection '
+                                           'and try again.'))
+        for widget_name in ("install_progress", "update_progress"):
+            widget = getattr(self, widget_name, None)
             if widget is not None:
                 widget.hide()
         self.install_hbtn.show()
@@ -471,37 +506,39 @@
         self.show_all()
         self.browser.set_no_show_all(True)
         self.browser.set_property("visible", True)
-        self.browser.connect("preview-mp3", self.re_emit_preview)
-        self.browser.connect("play-library", self.re_emit_playlibrary)
-        self.browser.connect("download-finished", self.re_emit_downloadfinished)
-        self.browser.connect("url-loaded", self.re_emit_urlloaded)
+        self.browser.connect("preview-mp3",
+                             self.re_emit_preview)
+        self.browser.connect("play-library",
+                             self.re_emit_playlibrary)
+        self.browser.connect("download-finished",
+                             self.re_emit_downloadfinished)
+        self.browser.connect("url-loaded",
+                             self.re_emit_urlloaded)
 
-    def do_impl_can_pause(self): 
+    def do_impl_can_pause(self):
         """Implementation can pause.
            If we don't handle this, Rhythmbox segfaults."""
-        return True # so we can pause, else we segfault
+        return True  # so we can pause, else we segfault
 
     def re_emit_preview(self, widget, url, title):
-        """Handle the preview-mp3 signal and re-emit it to the rb.Plugin."""
+        """Handle the preview-mp3 signal and re-emit it to rb.Plugin."""
         self.emit("preview-mp3", url, title)
 
     def re_emit_playlibrary(self, widget, path):
-        """Handle the play-library signal and re-emit it to the rb.Plugin."""
+        """Handle the play-library signal and re-emit it to rb.Plugin."""
         self.emit("play-library", path)
 
     def re_emit_downloadfinished(self, widget, path):
-        """Handle the download-finished signal and re-emit it to the rb.Plugin."""
+        """Handle the download-finished signal and re-emit it to rb.Plugin."""
         self.emit("download-finished", path)
 
     def re_emit_urlloaded(self, widget, url):
-        """Handle the url-loaded signal and re-emit it to the rb.Plugin."""
+        """Handle the url-loaded signal and re-emit it to rb.Plugin."""
         self.emit("url-loaded", url)
 
-    def do_set_property(self, property, value):
+    def do_set_property(self, prop, value):
         """Allow property settings to handle the plugin call."""
-        if property.name == 'plugin':
+        if prop.name == 'plugin':
             self.__plugin = value
         else:
-            raise AttributeError, 'unknown property %s' % property.name
-
-
+            raise AttributeError('unknown property %s' % prop.name)

=== modified file 'umusicstore/U1MSLinks.py'
--- umusicstore/U1MSLinks.py	2010-09-20 18:02:02 +0000
+++ umusicstore/U1MSLinks.py	2010-12-21 15:44:57 +0000
@@ -16,22 +16,35 @@
 #
 # Authored by Stuart Langridge <[e-mail]>
 
-import urllib, xml.parsers, cgi, os, locale, operator, re, unicodedata
-import gtk, gio, glib
-import rb, rhythmdb
+# Import gtk+/gio bits here because order matters for some unknown reason
+import glib
+import gtk
+import gio
+
+import cgi
+import gettext
+import locale
+import operator
+import os
+import re
+import rhythmdb
+import unicodedata
+import urllib
+import xml.parsers
+
+from gettext import lgettext as _
 from xml.dom import minidom
+
 try:
     import gwibber.lib.gtk.widgets
-    gwibber_available = True
+    GWIBBER_AVAILABLE = True
 except ImportError:
-    gwibber_available = False
+    GWIBBER_AVAILABLE = False
 
-import gettext
-from gettext import lgettext as _
 gettext.bindtextdomain("U1MSURL", "/usr/share/locale")
 gettext.textdomain("U1MSURL")
 
-ui_str = \
+UI_STR = \
 """<ui>
   <menubar name="MenuBar">
     <menu name="ViewMenu" action="View">
@@ -53,12 +66,10 @@
                 "the song in the Ubuntu One Music Store."),
     "could-not-find": _("Unable to automatically find the song that is "
                         "currently playing in the Ubuntu One Music Store. "
-                        "Please try searching manually."
-                        ),
+                        "Please try searching manually."),
     "could-not-connect": _("Unable to look up the song (couldn't connect "
                 "to Ubuntu One). Please check your internet "
-                "connection, or try again shortly.")
-}
+                "connection, or try again shortly.")}
 
 BASE_URL = os.environ.get("U1MSLINK_BASE_URL", "https://one.ubuntu.com")
 # getpreferredencoding isn't threadsafe, but we should be OK
@@ -66,10 +77,11 @@
 SCRUBBING_RE = re.compile(r"[\W\s]+", re.UNICODE)
 CLEANING_RE = re.compile(r"\s+", re.UNICODE)
 
-def normalize(a):
+
+def normalize(string):
     """Normalize the given string, to increase the chances of a match"""
     # rule #0 of unicode mangling: first, normalize
-    na = unicodedata.normalize('NFKD', a)
+    na = unicodedata.normalize('NFKD', string)
     # then, strip everything that's not alphanumeric
     na = re.sub(SCRUBBING_RE, "", na)
     # \w leaves _s
@@ -79,39 +91,52 @@
     # finally, lowercase
     na = na.lower()
     # if there's anything left, go with that, otherwise rollback
-    return na if na else a
-
-def modified_levenshtein(a,b):
-    """Calculates the Levenshtein distance between a and b, but counts added
-       characters as worth 0 (thus meaning that 'Foo' will match 
-       'Foo (Radio Edit)' with a high degree of accuracy.)"""
-    a = normalize(a)
-    b = normalize(b)
-    n, m = len(a), len(b)
-    if n > m:
-        # Make sure n <= m, to use O(min(n,m)) space
-        a,b = b,a
-        n,m = m,n
-        
-    current = range(n+1)
-    for i in range(1,m+1):
-        previous, current = current, [i]+[0]*n
-        for j in range(1,n+1):
-            add, delete = previous[j]+1, current[j-1]+1
-            change = previous[j-1]
-            if a[j-1] != b[i-1]:
+    return na if na else string
+
+
+def modified_levenshtein(start, end):
+    """Calculates the Levenshtein distance between start and end,
+    but counts added characters as worth 0 (thus meaning that 'Foo' will match
+    'Foo (Radio Edit)' with a high degree of accuracy.)"""
+    start = normalize(start)
+    end = normalize(end)
+    ls, le = len(start), len(end)
+    if ls > le:
+        # Make sure ls <= le, to use O(min(ls, le)) space
+        start, end = end, start
+        ls, le = le, ls
+
+    current = range(ls + 1)
+    for pose in range(1, le + 1):
+        previous, current = current, [pose] + [0] * ls
+        for poss in range(1, ls + 1):
+            delete = current[poss - 1] + 1
+            change = previous[poss - 1]
+            if start[poss - 1] != end[pose - 1]:
                 change = change + 1
             # replace add with 10000 to not count adds
-            current[j] = min(10000, delete, change)
-            
-    return current[n]
+            current[poss] = min(10000, delete, change)
+
+    return current[ls]
+
 
 class U1MSLinkProvider(object):
-    """Get a public link for any playing song to buy it in 
+    """Get a public link for any playing song to buy it in
        the Ubuntu One Music Store."""
 
     def __init__(self, find_file):
         self.find_file = find_file
+        self.track_fetch = None
+        self.artist_fetch = None
+        self.win = None
+        self.button = None
+        self.action_group = None
+        self.builder = None
+        self.pvb = None
+        self.tweet_button = None
+        self.message = None
+        self.ui_id = None
+        self.image = None
 
     def activate(self, shell):
         """Plugin startup."""
@@ -125,7 +150,7 @@
         self.action_group = gtk.ActionGroup('U1MSLinkPluginActions')
         self.action_group.add_action(action)
         manager.insert_action_group(self.action_group, 0)
-        self.ui_id = manager.add_ui_from_string(ui_str)
+        self.ui_id = manager.add_ui_from_string(UI_STR)
         manager.ensure_update()
 
     def deactivate(self, shell):
@@ -136,6 +161,7 @@
         manager.ensure_update()
 
     def dialog_response_cb(self, dialog, response_id):
+        """Destroy the window."""
         self.win.destroy()
         self.win = None
 
@@ -173,8 +199,9 @@
             _("Looking up <i>%s</i> by <i>%s</i> from <i>%s</i>") % (
             cgi.escape(title), cgi.escape(artist), cgi.escape(album)))
         self.lookup_artist(title, artist, album)
-    
+
     def display_error(self, messagename):
+        """Display error text and a warning icon."""
         self.builder.get_object("lblProgress").set_markup(ERRORS[messagename])
         self.image.set_from_icon_name("dialog-warning",
                                       gtk.ICON_SIZE_DIALOG)
@@ -184,12 +211,13 @@
         base_url = "http://api.7digital.com/1.2/artist/search"
         params = {"q": artist.encode("utf-8", "replace"),
                   "oauth_consumer_key": "canonical",
-                  "country":"GB"}
+                  "country": "GB"}
         url = "%s?%s" % (base_url, urllib.urlencode(params))
         self.artist_fetch = gio.File(url)
-        self.artist_fetch.read_async(self.artist_fetched, 
+        self.artist_fetch.read_async(
+            self.artist_fetched,
             user_data=(title, artist, album))
-    
+
     def artist_fetched(self, gdaemonfile, result, user_data):
         """Artist query is complete"""
         title, artist, album = user_data
@@ -217,8 +245,7 @@
             possibles.append((
                 anode.getAttribute("id"),
                 modified_levenshtein(name, artist),
-                name
-            ))
+                name))
         possibles.sort(key=operator.itemgetter(1))
         if not possibles:
             self.display_error('could-not-find')
@@ -227,7 +254,7 @@
         artist_id = possibles[0][0]
         print "got artist %s" % possibles[0][2]
         self.lookup_track(title, artist, album, artist_id)
-    
+
     def lookup_track(self, title, artist, album, artist_id):
         """Use the 7digital public API to look up the song."""
         # There is no way of searching the 7digital API and saying
@@ -238,7 +265,7 @@
         params = {"q": "%s %s" % (artist.encode("utf-8", "replace"),
                                   title.encode("utf-8", "replace")),
                   "oauth_consumer_key": "canonical",
-                  "country":"GB", "pagesize": 50}
+                  "country": "GB", "pagesize": 50}
         url = "%s?%s" % (base_url, urllib.urlencode(params))
         self.track_fetch = gio.File(url)
         self.track_fetch.read_async(self.track_fetched,
@@ -263,27 +290,35 @@
         possibles = []
         for tnode in tracknodes:
             anodes = tnode.getElementsByTagName("artist")
-            if not anodes: continue
+            if not anodes:
+                continue
             aid = anodes[0].getAttribute("id")
             if aid == artist_id:
                 artist_score = 0
                 artist_name = artist
             else:
                 atnodes = anodes[0].getElementsByTagName("name")
-                if not atnodes: continue
-                if not atnodes[0].hasChildNodes(): continue
+                if not atnodes:
+                    continue
+                if not atnodes[0].hasChildNodes():
+                    continue
                 # a +100 penalty for not being the right artist
                 artist_score = 100 + modified_levenshtein(
                     atnodes[0].firstChild.nodeValue, artist)
                 artist_name = atnodes[0].firstChild.nodeValue
             nnodes = tnode.getElementsByTagName("title")
-            if not nnodes: continue
-            if not nnodes[0].hasChildNodes(): continue
+            if not nnodes:
+                continue
+            if not nnodes[0].hasChildNodes():
+                continue
             rnodes = tnode.getElementsByTagName("release")
-            if not rnodes: continue
+            if not rnodes:
+                continue
             rtnodes = rnodes[0].getElementsByTagName("title")
-            if not rtnodes: continue
-            if not rtnodes[0].hasChildNodes(): continue
+            if not rtnodes:
+                continue
+            if not rtnodes[0].hasChildNodes():
+                continue
             track_score = modified_levenshtein(
                 nnodes[0].firstChild.nodeValue, title)
             album_score = modified_levenshtein(
@@ -310,32 +345,36 @@
         match = possibles[0]
         print "got a match", match
         dest_url = "%s/music/l/%s/%s" % (
-            BASE_URL, match["trackid"], "0") # this 0 should be userid
-        self.builder.get_object("lblProgress").set_markup(_("Found <i>%s</i> by <i>%s</i> from <i>%s</i>") % (
-            cgi.escape(match["track"]), cgi.escape(match["artist"]), 
-            cgi.escape(match["album"])))
-        self.builder.get_object("lblURL").set_markup("<big><b>%s</b></big>" % dest_url)
+            BASE_URL, match["trackid"], "0")  # this 0 should be userid
+        self.builder.get_object("lblProgress").set_markup(
+            _("Found <i>%s</i> by <i>%s</i> from <i>%s</i>") % (
+                cgi.escape(match["track"]), cgi.escape(match["artist"]),
+                cgi.escape(match["album"])))
+        self.builder.get_object("lblURL").set_markup(
+            "<big><b>%s</b></big>" % dest_url)
         clipboard = gtk.Clipboard(
             gtk.gdk.display_manager_get().get_default_display(), "CLIPBOARD")
         clipboard.set_text(dest_url)
 
-        if gwibber_available:
+        if GWIBBER_AVAILABLE:
             self.tweet_button = gtk.Button("Tweet this link")
-            self.tweet_button.connect("clicked", self.gwibber, dest_url, 
+            self.tweet_button.connect("clicked", self.gwibber, dest_url,
                 artist, album, title)
             self.win.get_content_area().pack_end(self.tweet_button)
             self.tweet_button.show()
-    
+
     def gwibber(self, button, url, artist, album, title):
+        """Show the Gwibber posting widget."""
         self.pvb = gwibber.lib.gtk.widgets.GwibberPosterVBox()
-        self.message = "Currently listening to %s by %s %s" % (title, artist, url)
-        self.pvb.input.connect("expose-event", self.gwibber_input_text) 
-        self.pvb.button_send.connect("clicked", 
+        self.message = "Currently listening to %s by %s %s" % (
+            title, artist, url)
+        self.pvb.input.connect("expose-event", self.gwibber_input_text)
+        self.pvb.button_send.connect("clicked",
             lambda x: self.builder.get_object("winMain").destroy())
         self.pvb.show_all()
         self.builder.get_object("vbMain").pack_end(self.pvb)
         self.tweet_button.hide()
 
     def gwibber_input_text(self, *args):
+        """Set the Gwibber text input."""
         self.pvb.input.set_text(self.message)
-

=== modified file 'umusicstore/__init__.py'
--- umusicstore/__init__.py	2010-09-23 16:36:08 +0000
+++ umusicstore/__init__.py	2010-12-21 15:44:57 +0000
@@ -17,23 +17,25 @@
 # Authored by Stuart Langridge <[e-mail]>
 
 import gconf
-from MusicStoreWidget import U1MusicStoreWidget
-from U1MSLinks import U1MSLinkProvider
-
-U1_FIRST_TIME_FLAG_ENTRY = "/apps/rhythmbox/plugins/umusicstore/first_time_flag"
-
 import rb
 
+from .MusicStoreWidget import U1MusicStoreWidget
+from .U1MSLinks import U1MSLinkProvider
+
+U1_FIRST_TIME_FLAG_ENTRY = \
+    "/apps/rhythmbox/plugins/umusicstore/first_time_flag"
+
+
 class U1MusicStorePlugin (rb.Plugin):
     """The Ubuntu One Music Store."""
 
     def __init__(self):
         rb.Plugin.__init__(self)
-        
+
         # The Music Store itself
         self.music_store_widget = U1MusicStoreWidget(
             plugin=self, find_file=self.find_file)
-        
+
         # The Links button
         self.music_store_links_provider = U1MSLinkProvider(
             find_file=self.find_file)
@@ -43,8 +45,8 @@
         self.music_store_widget.activate(shell)
         self.music_store_links_provider.activate(shell)
 
-	# Select the source if it's the first time
-        conf_client = gconf.client_get_default ()
+        # Select the source if it's the first time
+        conf_client = gconf.client_get_default()
         if not conf_client.get_bool(U1_FIRST_TIME_FLAG_ENTRY):
             shell.props.sourcelist.select(self.music_store_widget.source)
             conf_client.set_bool(U1_FIRST_TIME_FLAG_ENTRY, True)

=== removed file 'umusicstore/umusicstore.rb-plugin'
--- umusicstore/umusicstore.rb-plugin	2010-07-21 16:03:11 +0000
+++ umusicstore/umusicstore.rb-plugin	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[RB Plugin]
-Loader=python
-Module=umusicstore
-IAge=1
-Name=Ubuntu One Music Store
-Description=The Ubuntu One Music Store
-Authors=Stuart Langridge <[e-mail]>, Rodrigo Moya <[e-mail]>
-Copyright=Copyright © 2009 Canonical
-Website=http://one.ubuntu.com/
-