Merge lp:~dobey/rhythmbox-ubuntuone/new-pep8 into lp:rhythmbox-ubuntuone

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 121
Merged at revision: 121
Proposed branch: lp:~dobey/rhythmbox-ubuntuone/new-pep8
Merge into: lp:rhythmbox-ubuntuone
Diff against target: 45 lines (+11/-11)
2 files modified
setup.py (+1/-1)
ubuntuone/MusicStoreWidget.py (+10/-10)
To merge this branch: bzr merge lp:~dobey/rhythmbox-ubuntuone/new-pep8
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+138764@code.launchpad.net

Commit message

Fix new pep8 errors.

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

Why the need of: str('')??

review: Needs Information
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1
I don't like too much the str('') thing, but that is already in trunk

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2012-10-31 18:58:35 +0000
3+++ setup.py 2012-12-07 15:59:28 +0000
4@@ -17,4 +17,4 @@
5 ['ubuntuone/ubuntuone.py',
6 'ubuntuone/MusicStoreWidget.py',
7 ])],
8- )
9+)
10
11=== modified file 'ubuntuone/MusicStoreWidget.py'
12--- ubuntuone/MusicStoreWidget.py 2012-08-28 14:27:56 +0000
13+++ ubuntuone/MusicStoreWidget.py 2012-12-07 15:59:28 +0000
14@@ -161,21 +161,21 @@
15 """A Rhythmbox source widget for the U1 Music Store."""
16 # gproperties required so that rb.Source is instantiable
17 __gproperties__ = {
18- str('plugin'): (GObject.GObject, str('plugin'), str('plugin'),
19- GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
20- }
21+ str('plugin'): (GObject.GObject, str('plugin'), str('plugin'),
22+ GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
23+ }
24 # we have the preview-mp3 signal; we receive it from the widget, and
25 # re-emit it so that the plugin gets it, because the plugin actually
26 # plays the mp3
27 __gsignals__ = {
28- str("preview-mp3"): (GObject.SIGNAL_RUN_FIRST,
29- GObject.TYPE_NONE, (str, str)),
30- str("play-library"): (GObject.SIGNAL_RUN_FIRST,
31+ str("preview-mp3"): (GObject.SIGNAL_RUN_FIRST,
32+ GObject.TYPE_NONE, (str, str)),
33+ str("play-library"): (GObject.SIGNAL_RUN_FIRST,
34+ GObject.TYPE_NONE, (str,)),
35+ str("download-finished"): (GObject.SIGNAL_RUN_FIRST,
36+ GObject.TYPE_NONE, (str,)),
37+ str("url-loaded"): (GObject.SIGNAL_RUN_FIRST,
38 GObject.TYPE_NONE, (str,)),
39- str("download-finished"): (GObject.SIGNAL_RUN_FIRST,
40- GObject.TYPE_NONE, (str,)),
41- str("url-loaded"): (GObject.SIGNAL_RUN_FIRST,
42- GObject.TYPE_NONE, (str,)),
43 }
44
45 def __init__(self):

Subscribers

People subscribed via source and target branches