ui: Fixed python code style

This patch updates the python modules so that they follow the
Python style guidelines at [1]

1. http://www.python.org/dev/peps/pep-0008/

diff --git a/ui/maeviesui/maeviesui/gui.py b/ui/maeviesui/maeviesui/gui.py
index f7781de..41cc7b0 100644 (file)
--- a/ui/maeviesui/maeviesui/gui.py
+++ b/ui/maeviesui/maeviesui/gui.py
@@ -18,15 +18,15 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###########################################################################
 
-from maeviesui.util import constants
-
-import hildon
 import pygtk
+pygtk.require('2.0')
+import gtk
+import hildon
 import pango
 import gobject
+
+from maeviesui.util import constants
 from maeviesui.util.moviemanager import MovieManager
-pygtk.require("2.0")
-import gtk
 
 class Maevies(hildon.StackableWindow):
 
@@ -37,7 +37,7 @@ class Maevies(hildon.StackableWindow):
 
     def __init__(self):
         super(Maevies, self).__init__()
-        self.set_title("Maevies - 0.1")
+        self.set_title('Maevies - 0.1')
         self.connect('delete-event',
                      lambda widget, event: gtk.main_quit())
 
@@ -51,10 +51,11 @@ class Maevies(hildon.StackableWindow):
         box.set_border_width(20)
 
         button = hildon.Button(gtk.HILDON_SIZE_THUMB_HEIGHT,
-                               hildon.BUTTON_ARRANGEMENT_VERTICAL, title, subtitle)
-        button.connect("clicked", self._button_clicked, action)
+                               hildon.BUTTON_ARRANGEMENT_VERTICAL,
+                               title, subtitle)
+        button.connect('clicked', self._button_clicked, action)
 
-        box.pack_start(button, expand = True, fill = False)
+        box.pack_start(button, expand=True, fill=False)
 
         return box
 
@@ -62,15 +63,18 @@ class Maevies(hildon.StackableWindow):
         contents = gtk.HBox()
         contents.set_border_width(60)
         contents.set_homogeneous(True)
-        contents.pack_start(self._create_button("On Theaters", "Movies playing",
-                                             self.ACTION_THEATERS),
-                            expand = True, fill = True)
-        contents.pack_start(self._create_button("Favorites", "Your saved searches",
-                                             self.ACTION_FAVORITES),
-                            expand = True, fill = True)
-        contents.pack_start(self._create_button("Search", "Enter a new search",
-                                             self.ACTION_SEARCH),
-                            expand = True, fill = True)
+        contents.pack_start(self._create_button('On Theaters',
+                                                'Movies playing',
+                                                self.ACTION_THEATERS),
+                            expand=True, fill=True)
+        contents.pack_start(self._create_button('Favorites',
+                                                'Your saved searches',
+                                                self.ACTION_FAVORITES),
+                            expand=True, fill=True)
+        contents.pack_start(self._create_button('Search',
+                                                'Enter a new search',
+                                                self.ACTION_SEARCH),
+                            expand=True, fill=True)
 
         return contents;
 
@@ -78,8 +82,8 @@ class Maevies(hildon.StackableWindow):
         if action == self.ACTION_SEARCH:
             search_dialog = SearchDialog(self)
             if search_dialog.run() == gtk.RESPONSE_ACCEPT:
-                ResultsWindow(search_term = search_dialog.get_search_term(),
-                              search_category = search_dialog.get_search_category())
+                ResultsWindow(search_dialog.get_search_term(),
+                              search_dialog.get_search_category())
             search_dialog.destroy()
         elif action == self.ACTION_ABOUT:
             about_dialog = AboutDialog(self)
@@ -90,8 +94,8 @@ class Maevies(hildon.StackableWindow):
         menu = hildon.AppMenu()
 
         about = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
-        about.set_label("About")
-        about.connect("clicked", self._button_clicked, self.ACTION_ABOUT)
+        about.set_label('About')
+        about.connect('clicked', self._button_clicked, self.ACTION_ABOUT)
 
         menu.append(about)
 
@@ -105,14 +109,14 @@ class Maevies(hildon.StackableWindow):
 class SearchDialog(gtk.Dialog):
 
     _search_fields = [
-           "Movies",
-           "People",
+           'Movies',
+           'People',
            ]
 
     def __init__(self, parent):
-        super(SearchDialog, self).__init__(parent = parent,
-                                            flags = gtk.DIALOG_DESTROY_WITH_PARENT)
-        self.set_title("Enter search terms")
+        super(SearchDialog, self).__init__(parent=parent,
+                                           flags=gtk.DIALOG_DESTROY_WITH_PARENT)
+        self.set_title('Enter search terms')
 
         self.vbox.pack_start(self._create_contents(), True, False, 0)
         self.add_button(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
@@ -126,18 +130,18 @@ class SearchDialog(gtk.Dialog):
         search_contents = gtk.VBox()
 
         search_contents.pack_start(self._search_entry,
-                                   expand = True, fill = True)
+                                   expand=True, fill=True)
         search_contents.pack_start(search_button,
-                                   expand = True, fill = True)
+                                   expand=True, fill=True)
 
         return search_contents
 
     def _create_picker_button(self):
         self._picker_button = hildon.PickerButton(gtk.HILDON_SIZE_FINGER_HEIGHT,
-                                            hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
-        self._picker_button.set_title("Search for")
+                                                  hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
+        self._picker_button.set_title('Search for')
 
-        selector = hildon.TouchSelector(text = True)
+        selector = hildon.TouchSelector(text=True)
         selector.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE)
 
         for field in self._search_fields:
@@ -158,11 +162,11 @@ class ResultsWindow(hildon.StackableWindow):
 
     def __init__(self, search_term, search_category):
         super(ResultsWindow, self).__init__()
-        self.set_title("Search results")
+        self.set_title('Search results')
 
         self.add(self._create_contents())
 
-        self.moviemanager = MovieManager(response_received_cb = self._response_received_cb)
+        self.moviemanager = MovieManager(response_received_cb=self._response_received_cb)
         self._start_search(search_term, search_category)
         self.show_all()
 
@@ -188,10 +192,11 @@ class ResultsWindow(hildon.StackableWindow):
         hildon.hildon_gtk_window_set_progress_indicator(self, False)
 
     def _show_banner(self, search_term, search_category):
-        message = "Searching <i>%(category)s</i> for <i>%(term)s</i>" % {'category': search_category,
-                                                                         'term' : search_term}
+        message = ('Searching <i>%(category)s</i> for <i>%(term)s</i>' %
+                   {'category': search_category,
+                    'term' : search_term})
         banner = hildon.hildon_banner_show_information_with_markup(self,
-                                                                   "ignored",
+                                                                   'ignored',
                                                                    message)
         banner.set_timeout(constants.TIMEOUT_TIME_MILLIS)
 
@@ -203,12 +208,14 @@ class MoviesView(gtk.TreeView):
         self.set_model(model)
 
         movie_image_renderer = gtk.CellRendererPixbuf()
-        column = gtk.TreeViewColumn('Image', movie_image_renderer, pixbuf = model.IMAGE_COLUMN)
+        column = gtk.TreeViewColumn('Image', movie_image_renderer,
+                                    pixbuf=model.IMAGE_COLUMN)
         self.append_column(column)
 
         movie_text_renderer = gtk.CellRendererText()
         movie_text_renderer.set_property('ellipsize', pango.ELLIPSIZE_END)
-        column = gtk.TreeViewColumn('Name', movie_text_renderer, markup = model.INFO_COLUMN)
+        column = gtk.TreeViewColumn('Name', movie_text_renderer,
+                                    markup=model.INFO_COLUMN)
         self.append_column(column)
 
         self.show_all()
@@ -244,9 +251,9 @@ class MoviesListStore(gtk.ListStore):
 class AboutDialog(gtk.Dialog):
 
     def __init__(self, parent):
-        super(AboutDialog, self).__init__(parent = parent,
-                                          flags = gtk.DIALOG_DESTROY_WITH_PARENT)
-        self.set_title("About Maevies")
+        super(AboutDialog, self).__init__(parent=parent,
+                                          flags=gtk.DIALOG_DESTROY_WITH_PARENT)
+        self.set_title('About Maevies')
 
         self.show_all()
 
@@ -261,28 +268,32 @@ class MovieWindow(hildon.StackableWindow):
         upper_content.set_border_width(20)
 
         image = gtk.Image()
-        image.set_from_pixbuf(gtk.IconTheme().load_icon('mediaplayer_default_album', 256, 0))
+        image.set_from_pixbuf(gtk.IconTheme().load_icon('mediaplayer_default_album',
+                                                        256, 0))
 
         side_content = gtk.VBox(False, 30)
 
         for key in movie.fields:
             label = gtk.Label()
-            label.set_markup("<b>%(field)s:</b> <small>%(value)s</small>" % {'field' : key,
-                                                                             'value' : movie.get_value(key)})
-            label.set_alignment(constants.LEFT_ALIGNMENT, constants.CENTER_ALIGNMENT)
+            label.set_markup('<b>%(field)s:</b> <small>%(value)s</small>' %
+                             {'field' : key,
+                              'value' : movie.get_value(key)})
+            label.set_alignment(constants.LEFT_ALIGNMENT,
+                                constants.CENTER_ALIGNMENT)
             side_content.pack_start(label, False, False)
 
         upper_content.pack_start(image, False, False)
         upper_content.pack_start(side_content, False, False)
 
         movie_overview = hildon.TextView()
-        movie_overview.set_placeholder("Overview")
+        movie_overview.set_placeholder('Overview')
         movie_overview.set_wrap_mode(gtk.WRAP_WORD)
         movie_overview.get_buffer().set_text(movie.get_overview())
 
         label = gtk.Label()
-        label.set_markup("<b>Overview:</b>")
-        label.set_alignment(constants.LEFT_ALIGNMENT, constants.CENTER_ALIGNMENT)
+        label.set_markup('<b>Overview:</b>')
+        label.set_alignment(constants.LEFT_ALIGNMENT,
+                            constants.CENTER_ALIGNMENT)
 
         main_box.pack_start(upper_content, False, False)
         main_box.pack_start(label, False, False)
@@ -295,10 +306,10 @@ class MovieWindow(hildon.StackableWindow):
 
     def __init__(self, movie):
         super(MovieWindow, self).__init__()
-        self.set_title("Movie info")
+        self.set_title('Movie info')
         self.add(self._create_contents(movie))
         self.show_all()
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     maevies = Maevies()
     maevies.run()

diff --git a/ui/maeviesui/util/constants.py b/ui/maeviesui/util/constants.py
index e446d50..988c1c0 100644 (file)
--- a/ui/maeviesui/util/constants.py
+++ b/ui/maeviesui/util/constants.py
@@ -28,10 +28,10 @@ LOCAL_DATA_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
 TIMEOUT_TIME_MILLIS = 500
 LEFT_ALIGNMENT = 0
 CENTER_ALIGNMENT = 0.5
-LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. \
+LOREM_IPSUM = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. \
 Vestibulum sit amet dolor sit amet enim ultricies iaculis eu sed leo. Donec \
 ultrices massa ut leo porttitor facilisis. Fusce neque nisl, varius id \
 vestibulum non, tincidunt eu magna. Curabitur consectetur, nisl nec volutpat \
 iaculis, odio neque venenatis diam, vitae cursus lectus orci a felis. \
 Pellentesque sit amet elementum lorem. Duis tempor pulvinar augue nec \
-bibendum. Suspendisse sit amet placerat lectus."
+bibendum. Suspendisse sit amet placerat lectus.'

diff --git a/ui/maeviesui/util/moviemanager.py b/ui/maeviesui/util/moviemanager.py
index 4689eee..d5148c9 100644 (file)
--- a/ui/maeviesui/util/moviemanager.py
+++ b/ui/maeviesui/util/moviemanager.py
@@ -36,7 +36,7 @@ WATC = 1
 
 class MovieManager:
 
-    def __init__(self, response_received_cb = None):
+    def __init__(self, response_received_cb=None):
         self.response_received_cb = response_received_cb
         self._bus = None
         self._provider = None
@@ -52,12 +52,12 @@ class MovieManager:
         provider_proxy = self._bus.get_object(MINFO_PROVIDER_BUS_NAME,
                                              '/MInfoProvider')
         provider_interface = dbus.Interface(provider_proxy,
-                                            dbus_interface = MINFO_PROVIDER_INTERFACE)
-        provider_interface.connect_to_signal("ResponseReceived",
+                                            dbus_interface=MINFO_PROVIDER_INTERFACE)
+        provider_interface.connect_to_signal('ResponseReceived',
                                              self._on_response_received)
         return provider_interface
 
-    def query(self, movie_name = '', query_type = TMDB):
+    def query(self, movie_name='', query_type=TMDB):
         try:
             self._get_provider().Query(query_type, movie_name)
         except DBusException:
@@ -76,26 +76,26 @@ class MovieProxy:
     def __init__(self, bus, object_path):
         self._bus = bus
         self.interface = self._create_movie_interface(object_path)
-        self.fields = ["Title", "Release date", "Rating", "Popularity"]
+        self.fields = ['Title', 'Release date', 'Rating', 'Popularity']
 
     def _create_movie_interface(self, object_path):
         proxy = self._bus.get_object(TMDB_MOVIE_BUS_NAME,
                                     object_path)
         interface = dbus.Interface(proxy,
-                                   dbus_interface = TMDB_MOVIE_INTERFACE)
+                                   dbus_interface=TMDB_MOVIE_INTERFACE)
         return interface
 
     def get_value(self, field):
-        if field == "Title":
+        if field == 'Title':
             return self.get_title()
-        elif field == "Release date":
+        elif field == 'Release date':
             return self.get_released()
-        elif field == "Rating":
+        elif field == 'Rating':
             return self.get_rating()
-        elif field == "Popularity":
+        elif field == 'Popularity':
             return self.get_popularity()
         else:
-            return ""
+            return ''
 
     def get_title(self):
         return self.interface.GetTitle()
@@ -110,11 +110,13 @@ class MovieProxy:
         return self.interface.GetReleased()
 
     def get_info(self):
-        return "<b>%(title)s</b>\n<small><i>Popularity: </i>%(popularity)s\
-    <i>Rating: </i>%(rating)s    <i>Released: </i>%(released)s</small>" % {'title' : self.get_title(),
-                                                                           'popularity' : self.get_popularity(),
-                                                                           'rating' : self.get_rating(),
-                                                                           'released' : self.get_released()}
+        return ('<b>%(title)s</b>\n<small><i>Popularity: </i>%(popularity)s'
+                '    <i>Rating: </i>%(rating)s    <i>Released: </i>'
+                '%(released)s</small>' %
+                {'title' : self.get_title(),
+                 'popularity' : self.get_popularity(),
+                 'rating' : self.get_rating(),
+                 'released' : self.get_released()})
 
     def get_overview(self):
         return self.interface.GetOverview()