Merge lp:~dobey/rhythmbox-ubuntuone/update-4-0 into lp:rhythmbox-ubuntuone/stable-4-0

[dobey]

[Rodney Dawes]

    Fix syntax issues that would prevent loading from Python 3.
    Switch to using pyflakes.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~dobey/rhythmbox-ubuntuone/update-4-0]

122. By dobey on 2012-08-27

[Rodney Dawes]

    Fix syntax issues that would prevent loading from Python 3.
    Switch to using pyflakes.

=== modified file 'run-tests'
--- run-tests	2012-01-12 21:34:43 +0000
+++ run-tests	2012-08-27 20:33:32 +0000
@@ -15,7 +15,7 @@
 # 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=ubuntuone
-u1lint .
+USE_PYFLAKES=1 u1lint .
 if [ -x `which pep8` ]; then
     pep8 --repeat .
 else

=== modified file 'ubuntuone/MusicStoreWidget.py'
--- ubuntuone/MusicStoreWidget.py	2012-03-20 20:26:40 +0000
+++ ubuntuone/MusicStoreWidget.py	2012-08-27 20:33:32 +0000
@@ -14,9 +14,10 @@
 # <http://www.gnu.org/licenses/>.
 """The Ubuntu One Rhythmbox plugin."""
 
+from __future__ import print_function, unicode_literals
+
 import gettext
 import os
-import urlparse
 
 # pylint: disable=E0611,F0401
 from gi.repository import Gio, GObject, Gtk, RB
@@ -24,6 +25,13 @@
 # pylint: enable=E0611,F0401
 
 from gettext import lgettext as _
+parseurl = None
+try:
+    import urllib.parse
+    parseurl = urllib.parse.urlparse
+except ImportError:
+    import urlparse
+    parseurl = urlparse.urlparse
 
 gettext.bindtextdomain("rhythmbox-ubuntuone", "/usr/share/locale")
 gettext.textdomain("rhythmbox-ubuntuone")
@@ -94,7 +102,7 @@
 
     def url_loaded(self, source, url):
         """A URL is loaded in the plugin"""
-        if urlparse.urlparse(url)[2] == "https":
+        if parseurl(url)[2] == "https":
             pass
         else:
             pass
@@ -124,7 +132,7 @@
         uri = self._udf_path_to_library_uri(path)
         entry = self.db.entry_lookup_by_location(uri)
         if not entry:
-            print "couldn't find entry", uri
+            print("couldn't find entry: %s" % uri)
             return
         libsrc = self.shell.props.library_source
         artist_view, album_view = libsrc.get_property_views()[0:2]

=== modified file 'ubuntuone/ubuntuone.py'
--- ubuntuone/ubuntuone.py	2012-03-23 17:59:40 +0000
+++ ubuntuone/ubuntuone.py	2012-08-27 20:33:32 +0000
@@ -14,6 +14,8 @@
 # <http://www.gnu.org/licenses/>.
 """The Ubuntu One Rhythmbox plugin."""
 
+from __future__ import print_function, unicode_literals
+
 # pylint: disable=E0611
 from gi.repository import Gio, GObject, Peas
 # pylint: enable=E0611
@@ -50,7 +52,7 @@
             libraries.remove(U1LIBRARYPATH)
             self.rdbconf.set_strv('locations', libraries)
         # Remove the unescaped uri path if it exists
-        unescaped_path = u'file://{0}'.format(U1LIBRARYPATH)
+        unescaped_path = 'file://{0}'.format(U1LIBRARYPATH)
         if unescaped_path in libraries:
             libraries.remove(unescaped_path)
             self.rdbconf.set_strv('locations', libraries)