GNOME.org
 

[totem] plugins: Tidy up undefined variables and unused arguments

commit c1369b32235ac8b615d1850093896475f5e165a5
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Mar 27 12:57:54 2011 +0100

    plugins: Tidy up undefined variables and unused arguments
    
    This shuts pylint up some more. Helps: bgo#645739

 src/plugins/coherence_upnp/coherence_upnp.py |    6 ++--
 src/plugins/iplayer/iplayer.py               |    6 ++--
 src/plugins/iplayer/iplayer2.py              |   12 ++++----
 src/plugins/iplayer/listparser.py            |   11 ++++----
 src/plugins/jamendo/jamendo.py               |   34 ++++++++++++-------------
 src/plugins/opensubtitles/opensubtitles.py   |   25 ++++++++----------
 src/plugins/pythonconsole/pythonconsole.py   |    6 ++--
 7 files changed, 47 insertions(+), 53 deletions(-)
---
diff --git a/src/plugins/coherence_upnp/coherence_upnp.py b/src/plugins/coherence_upnp/coherence_upnp.py
index 1a8f63d..c903b07 100644
--- a/src/plugins/coherence_upnp/coherence_upnp.py
+++ b/src/plugins/coherence_upnp/coherence_upnp.py
@@ -35,7 +35,7 @@ class UPnPClient (gobject.GObject, Peas.Activatable):
         selection = self.uiw.treeview.get_selection ()
         selection.set_mode (gtk.SELECTION_MULTIPLE)
 
-    def button_pressed (self, widget, event):
+    def button_pressed (self, _widget, event):
         if event.button == 3:
             event_x = int (event.x)
             event_y = int (event.y)
@@ -68,9 +68,9 @@ class UPnPClient (gobject.GObject, Peas.Activatable):
     def create_item_context (self, has_delete = False):
         """ create context menu for right click in treeview item"""
 
-        def action (menu, text):
+        def action (_menu, text):
             selection = self.uiw.treeview.get_selection ()
-            model, selected_rows = selection.get_selected_rows ()
+            _model, selected_rows = selection.get_selected_rows ()
             if text == 'item.delete':
                 for row_path in selected_rows:
                     self.uiw.destroy_object (row_path)
diff --git a/src/plugins/iplayer/iplayer.py b/src/plugins/iplayer/iplayer.py
index 44df066..fcb4d5f 100644
--- a/src/plugins/iplayer/iplayer.py
+++ b/src/plugins/iplayer/iplayer.py
@@ -60,7 +60,7 @@ class IplayerPlugin (gobject.GObject, Peas.Activatable):
         # Add the channels' categories in a thread, since they each require a
         # network request
         parent_path = tree_store.get_path (parent_iter)
-        thread = PopulateChannelsThread (self, parent_path, feed, tree_store)
+        thread = PopulateChannelsThread (self, feed, tree_store)
         thread.start ()
 
     def _populate_channel_list_cb (self, tree_store, parent_path, values):
@@ -160,7 +160,7 @@ def category_name_to_id (category_name):
 
 class PopulateChannelsThread (threading.Thread):
     # Class to populate the channel list from the Internet
-    def __init__ (self, plugin, parent_path, feed, tree_model):
+    def __init__ (self, plugin, feed, tree_model):
         self.plugin = plugin
         self.feed = feed
         self.tree_model = tree_model
@@ -178,7 +178,7 @@ class PopulateChannelsThread (threading.Thread):
                 # We have to pass a path because the model could theoretically
                 # be modified while the idle function is waiting in the queue,
                 # invalidating an iter
-                for name, count in self.feed.get (channel_id).categories ():
+                for name, _count in self.feed.get (channel_id).categories ():
                     category_id = category_name_to_id (name)
                     gobject.idle_add (self.plugin._populate_channel_list_cb,
                                       self.tree_model, parent_path,
diff --git a/src/plugins/iplayer/iplayer2.py b/src/plugins/iplayer/iplayer2.py
index f9537d5..41aa456 100644
--- a/src/plugins/iplayer/iplayer2.py
+++ b/src/plugins/iplayer/iplayer2.py
@@ -339,7 +339,7 @@ def httpretrieve (url, filename):
     data_file.close ()
 
 def httpget (url):
-    resp, data = HTTP_OBJECT.request (url, 'GET')
+    _response, data = HTTP_OBJECT.request (url, 'GET')
     return data
 
 def parse_entry_id (entry_id):
@@ -367,7 +367,7 @@ class Media (object):
             page.close ()
             url = page.geturl ()
             #logging.info ("URL resolved to %s", url)
-            return page.geturl ()
+            return url
         else:
             return self.connection_href
 
@@ -390,7 +390,7 @@ class Media (object):
                  self.connection_protocol)
         return tep.get (media, None)
 
-    def read_media_node (self, media, resolve=False):
+    def read_media_node (self, media):
         """
         Reads media info from a media XML node
         media: media node from BeautifulStoneSoup
@@ -926,10 +926,10 @@ class Feed (object):
             return None
         if self.tvradio == 'tv':
             return [Feed ('tv', channel = ch)
-                    for (ch, title) in CHANNELS_TV_LIST]
+                    for (ch, _title) in CHANNELS_TV_LIST]
         if self.tvradio == 'radio':
             return [Feed ('radio', channel = ch)
-                    for (ch, title) in CHANNELS_RADIO_LIST]
+                    for (ch, _title) in CHANNELS_RADIO_LIST]
         return None
 
     def subcategories (self):
@@ -959,7 +959,7 @@ class Feed (object):
             return False
         return letter
 
-    def sub (self, *args, **kwargs):
+    def sub (self, *_args, **kwargs):
         """
         Clones this feed, altering the specified parameters.
 
diff --git a/src/plugins/iplayer/listparser.py b/src/plugins/iplayer/listparser.py
index 5802d72..eac01b7 100644
--- a/src/plugins/iplayer/listparser.py
+++ b/src/plugins/iplayer/listparser.py
@@ -24,11 +24,11 @@ class ListEntries (object):
         self.entries = []
 
 def parse (xml_source):
-    try:
-        regexp = "<\?xml version=\"[^\"]*\" encoding=\" ([^\"]*)\"\?>"
-        encoding = re.findall (regexp, xml_source)[0]
-    except:
-        return None
+    #try:
+    #    regexp = "<\?xml version=\"[^\"]*\" encoding=\" ([^\"]*)\"\?>"
+    #    encoding = re.findall (regexp, xml_source)[0]
+    #except:
+    #    return None
 
     elist = ListEntries ()
     # gather all list entries
@@ -37,7 +37,6 @@ def parse (xml_source):
 
     # enumerate thru the element list and gather info
     for entry_src in entries_src:
-        entry = {}
         title = re.findall ("<title[^>]*> (.*?)</title>",
                             entry_src, re.DOTALL)[0]
         identifier = re.findall ("<id[^>]*> (.*?)</id>",
diff --git a/src/plugins/jamendo/jamendo.py b/src/plugins/jamendo/jamendo.py
index 2f1de2a..70b0657 100644
--- a/src/plugins/jamendo/jamendo.py
+++ b/src/plugins/jamendo/jamendo.py
@@ -185,20 +185,20 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         """
         self.settings.set_enum ('format', combo.get_active ())
 
-    def on_format_setting_changed (self, settings, key, combo):
+    def on_format_setting_changed (self, _settings, _key, combo):
         """
         Called for the "format" preference combo box when the corresponding
         GSettings value is changed.
         """
         combo.set_active (self.settings.get_enum ('format'))
 
-    def on_format_changed (self, settings, key):
+    def on_format_changed (self, _settings, _key):
         JamendoService.AUDIO_FORMAT = self.settings.get_enum ('format')
 
-    def on_num_per_page_changed (self, settings, key):
+    def on_num_per_page_changed (self, _settings, _key):
         JamendoService.NUM_PER_PAGE = self.settings.get_int ('num-per-page')
 
-    def on_config_widget_destroy (self, widget):
+    def on_config_widget_destroy (self, _widget):
         try:
             self.reset ()
         except:
@@ -411,7 +411,6 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         Called when the thread finished fetching albums.
         """
         pindex = self.treeviews.index (treeview)
-        model = treeview.get_model ()
         if save_state and len (albums):
             self.pages[pindex].append (albums)
             self.current_page[pindex] = len (self.pages[pindex])
@@ -450,13 +449,13 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         self.totem.action_error (_(u'An error occurred while fetching albums.'),
                                  msg)
 
-    def on_search_entry_activate (self, *args):
+    def on_search_entry_activate (self, *_args):
         """
         Called when the user typed <enter> in the search entry.
         """
         return self.on_search_button_clicked ()
 
-    def on_search_button_clicked (self, *args):
+    def on_search_button_clicked (self, *_args):
         """
         Called when the user clicked on the search button.
         """
@@ -468,7 +467,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         else:
             self.on_notebook_switch_page (new_search=True)
 
-    def on_notebook_switch_page (self, page_number = None, tab = None,
+    def on_notebook_switch_page (self, _page_number = None, _tab = None,
                                  tab_num = 0, new_search = False):
         """
         Called when the changed a notebook page.
@@ -488,7 +487,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         model.clear ()
         self.fetch_albums ()
 
-    def on_treeview_row_activated (self, tree_view, path, column):
+    def on_treeview_row_activated (self, _tree_view, path, _column):
         """
         Called when the user double-clicked on a treeview element.
         """
@@ -539,7 +538,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         (_model, rows) = selection.get_selected_rows ()
         self.album_button.set_sensitive (len (rows) > 0)
 
-    def on_previous_button_clicked (self, *args):
+    def on_previous_button_clicked (self, *_args):
         """
         Called when the user clicked the previous button.
         """
@@ -553,7 +552,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
             self.add_treeview_item (self.current_treeview, album)
         self.on_fetch_albums_done (self.current_treeview, albums, False)
 
-    def on_next_button_clicked (self, *args):
+    def on_next_button_clicked (self, *_args):
         """
         Called when the user clicked the next button.
         """
@@ -570,7 +569,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
                 self.add_treeview_item (self.current_treeview, album)
             self.on_fetch_albums_done (self.current_treeview, albums, False)
 
-    def on_album_button_clicked (self, *args):
+    def on_album_button_clicked (self, *_args):
         """
         Called when the user clicked on the album button.
         """
@@ -580,7 +579,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         except:
             pass
 
-    def on_add_to_playlist_activate (self, *args):
+    def on_add_to_playlist_activate (self, *_args):
         """
         Called when the user clicked on the add to playlist button of the
         popup menu.
@@ -594,7 +593,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
                 # we have a track
                 self.add_track_to_playlist ('enqueue', item)
 
-    def on_open_album_page_activate (self, *args):
+    def on_open_album_page_activate (self, *_args):
         """
         Called when the user clicked on the jamendo album page button of the
         popup menu.
@@ -639,7 +638,7 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         self.album_button.set_sensitive (itera is not None)
 
 
-    def _format_str (self, string, truncate=False):
+    def _format_str (self, string):
         """
         Escape entities for pango markup and force the string to utf-8.
         """
@@ -693,9 +692,8 @@ class JamendoService (threading.Thread):
         try:
             self.lock.acquire ()
             albums = json.loads (self._request (url))
-            ret = []
-            for i, album in enumerate (albums):
-                fname, headers = urllib.urlretrieve (album['image'])
+            for _pos, album in enumerate (albums):
+                fname, _headers = urllib.urlretrieve (album['image'])
                 album['image'] = fname
                 album['tracks'] = json.loads (self._request (
                     '%s/id+name+duration+stream/track/json/?album_id=%s'\
diff --git a/src/plugins/opensubtitles/opensubtitles.py b/src/plugins/opensubtitles/opensubtitles.py
index 3331654..1310f09 100644
--- a/src/plugins/opensubtitles/opensubtitles.py
+++ b/src/plugins/opensubtitles/opensubtitles.py
@@ -344,7 +344,7 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
 
     # UI related code
 
-    def os_build_dialog (self, action):
+    def os_build_dialog (self):
         builder = Totem.plugin_load_interface ("opensubtitles",
                                                "opensubtitles.ui", True,
                                                self.totem.get_main_window (),
@@ -409,8 +409,7 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
 
         # Set up signals
 
-        combobox_changed_id = combobox.connect ('changed',
-                                                self.on_combobox__changed)
+        combobox.connect ('changed', self.on_combobox__changed)
         self.dialog.connect ('delete-event', self.dialog.hide_on_delete)
         self.dialog.set_transient_for (self.totem.get_main_window ())
         self.dialog.set_position (Gtk.WindowPosition.CENTER_ON_PARENT)
@@ -421,9 +420,9 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
                                                 self.on_treeview__row_change)
         self.treeview.connect ('row-activated', self.on_treeview__row_activate)
 
-    def os_show_dialog (self, action):
+    def os_show_dialog (self, _action):
         if not self.dialog:
-            self.os_build_dialog (action)
+            self.os_build_dialog ()
 
         filename = self.totem.get_current_mrl ()
         if not self.model.results or filename != self.filename:
@@ -547,8 +546,6 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
             subtitle_id = model.get_value (subtitle_iter, 3)
             subtitle_format = model.get_value (subtitle_iter, 1)
 
-            gfile = None
-
             if not filename:
                 bpath = xdg.BaseDirectory.xdg_cache_home + sep
                 bpath += 'totem' + sep
@@ -635,7 +632,7 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
 
     # Callbacks
 
-    def on_window__key_press_event (self, widget, event):
+    def on_window__key_press_event (self, _widget, event):
         if event.keyval == Gdk.KEY_Escape:
             self.dialog.destroy ()
             self.dialog = None
@@ -648,10 +645,10 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
         else:
             self.apply_button.set_sensitive (False)
 
-    def on_treeview__row_activate (self, tree_path, column, data):
+    def on_treeview__row_activate (self, _tree_path, _column, _data):
         self.os_download_and_apply ()
 
-    def on_totem__file_opened (self, totem, filename):
+    def on_totem__file_opened (self, _totem, _filename):
         """
         """
         # Check if allows subtitles
@@ -672,7 +669,7 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
                 self.apply_button.set_sensitive (False)
                 self.find_button.set_sensitive (False)
 
-    def on_totem__file_closed (self, totem):
+    def on_totem__file_closed (self, _totem):
         self.action.set_sensitive (False)
         if self.dialog:
             self.apply_button.set_sensitive (False)
@@ -684,14 +681,14 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
         self.model.lang = LANGUAGES[combo_model.get_value (combo_iter, 1)]
         self.settings.set_string ('language', self.model.lang)
 
-    def on_close_clicked (self, data):
+    def on_close_clicked (self, _data):
         self.dialog.destroy ()
         self.dialog = None
 
-    def on_apply_clicked (self, data):
+    def on_apply_clicked (self, _data):
         self.os_download_and_apply ()
 
-    def on_find_clicked (self, data):
+    def on_find_clicked (self, _data):
         self.apply_button.set_sensitive (False)
         self.find_button.set_sensitive (False)
         self.filename = self.totem.get_current_mrl ()
diff --git a/src/plugins/pythonconsole/pythonconsole.py b/src/plugins/pythonconsole/pythonconsole.py
index b51c719..bc1187d 100644
--- a/src/plugins/pythonconsole/pythonconsole.py
+++ b/src/plugins/pythonconsole/pythonconsole.py
@@ -113,7 +113,7 @@ class PythonConsolePlugin (gobject.GObject, Peas.Activatable):
 
         self.totem.set_data ('PythonConsolePluginInfo', data)
 
-    def show_console (self, action):
+    def show_console (self, _action):
         if not self.window:
             console = PythonConsole (namespace = {
                 '__builtins__' : __builtins__,
@@ -134,7 +134,7 @@ class PythonConsolePlugin (gobject.GObject, Peas.Activatable):
             self.window.show_all ()
             self.window.grab_focus ()
 
-    def enable_debugging (self, action):
+    def enable_debugging (self, _action):
         msg = _(u"After you press OK, Totem will wait until you connect to it "\
                  "with winpdb or rpdb2. If you have not set a debugger "\
                  "password in DConf, it will use the default password "\
@@ -152,7 +152,7 @@ class PythonConsolePlugin (gobject.GObject, Peas.Activatable):
             gobject.idle_add (start_debugger, password)
         dialog.destroy ()
 
-    def destroy_console (self, *args):
+    def destroy_console (self, *_args):
         self.window.destroy ()
         self.window = None
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]