Merge lp:~rockstar/entertainer/trivial-fixes into lp:entertainer

[Paul Hummer]

[Paul Hummer (rockstar)]

This branch fixes a bunch of small issues, mostly technical debt. The branch
started a few nights ago when I thought "I have time to address some smaller
issues in Entertainer" and then I kept getting greedier and greedier, fixing
more and more issues. Please see the branch itself for the bugs it fixes.

There's no lint, and this branch fixes the broken test. Basically, the test
was asserting that the forecast would read "Today" but the API changed to
return the current day ("Sat" in this case, as it's Saturday).

More lint checks have been enabled. I'm amazed at how much we were stepping on
builtins... :/

Things I'd like you (the reviewer) to check:

  - I've made lots of changes, and the tests seem to pass. Please verify that
    everything works.
  - There were places where I replaced 'type' (a builtin) with 'kind' but it
    may be better in that case to call the variable 'foo_type' to indicate what
    type is being checked. In some cases, it may not matter. Please make sure
    that it doesn't matter.

--
Paul Hummer
http://theironlion.net
1024/862FF08F C921 E962 58F8 5547 6723 0E8C 1C4D 8AC5 862F F08F

[Matt Layman (mblayman)]

approve merge_conditional

1) You linked to Bug 313841 XXX: pylint unused args, which is about removing W0613, but what you actually fixed was W0612. Great work cleaning up 612, but if you want to continue to link to Bug 313841, please do something about W0613 (whether that be to ignore it forever or enable it and clean up the problem areas).

2) You changed buffer_probe to _buffer_probe, but nothing seems to use _buffer_probe. Why was this done?

3) You enabled W0622 and cleaned everything up, but you left in the related XXX line in pylintrc.

After these things are addressed, I'm happy with this branch. It was actually pretty educational learning about all the builtins that we overrode that I didn't even know existed. Thanks!

review: Approve

[Paul Hummer (rockstar)]

> 1) You linked to Bug 313841 XXX: pylint unused args, which is about
> removing W0613, but what you actually fixed was W0612. Great work cleaning
> up 612, but if you want to continue to link to Bug 313841, please do
> something about W0613 (whether that be to ignore it forever or enable it
> and clean up the problem areas).

Removed the link. I actually just removed unused variables, which apparently
didn't have a bug for it. No biggie.

> 2) You changed buffer_probe to _buffer_probe, but nothing seems to use
> _buffer_probe. Why was this done?

Removed that code.

> 3) You enabled W0622 and cleaned everything up, but you left in the related
> XXX line in pylintrc.

Removed this as well. I wasn't taking out the XXX until I was done. I guess I
forgot one.

Here's the incremental diff:

=== modified file 'entertainerlib/utils/video_thumbnailer.py'
--- entertainerlib/utils/video_thumbnailer.py 2009-02-07 17:12:21 +0000
+++ entertainerlib/utils/video_thumbnailer.py 2009-02-07 19:44:46 +0000
@@ -25,8 +25,7 @@ class VideoThumbnailerException(Exceptio

 class VideoThumbnailer(thumbnailer.Thumbnailer):
- ''' VideoThumbnailer does exactly what it's name demonstrates it does:
- create thumbnailed images of the videos.'''
+ '''Create thumbnails from videos.'''

     class VideoSinkBin(gst.Bin):
         '''A gstreamer sink bin'''
@@ -247,51 +246,6 @@ class VideoThumbnailer(thumbnailer.Thumb
         ## How often Proceed?
         self._counter = 5

- def _buffer_probe(pad, buff):
- '''Probe the buffer'''
- ## Proceed only every 5th frame!
- if self._every_co < self._every:
- self._every_co += 1
- return
- self._every_co = 0
-
- try:
- img = Image.frombuffer("RGB", sink_size, buff,
- "raw", "RGB",0, 1)
- except Exception:
- #Invalid frame
- pass
- else:
- self._img = img
- if self.interesting_image(self._img):
-
- self._img.thumbnail(
- (self.MAX_SIZE, self.MAX_SIZE),
- Image.BILINEAR
- )
- if img.mode != 'RGBA':
- img = img.convert(mode='RGBA')
-
- #Releasing self._img
- self._sink.reset()
- pad.remove_buffer_probe(fileid)
- self._blocker.set()
- return
-
- self._counter -= 1
- if self._counter <= 0:
- #Counter off, resetting blocker
- # Is it better to return no image instead of a 'boring' one?
- if self._img:
- self._img.thumbnail(sink_size, Image.BILINEAR)
- if img.mode != 'RGBA':
- img = img.convert(mode='RGBA')
-
- self._sink.reset()
- pad.remove_buffer_probe(fileid)
- self._blocker.set()
-
-
         self.set_state_blocking(self._pipeline, gst.STATE_PLAYING)

         self._blocker.wait()

=== modified fi...

=== modified file 'entertainerlib/backend/components/feeds/feed_fetcher.py'
--- entertainerlib/backend/components/feeds/feed_fetcher.py	2008-10-25 17:56:14 +0000
+++ entertainerlib/backend/components/feeds/feed_fetcher.py	2009-02-06 08:13:48 +0000
@@ -105,15 +105,6 @@
                         e_timestamp = datetime(ed[0], ed[1], ed[2],
                                                ed[3], ed[4], ed[5])
 
-                        # If there is no entry ID we generate one from URL
-                        # and entry datetime
-                        try:
-                            entry_id = data.entries[i].id
-                        except:
-                            entry_id = data.feed.link + "_" + \
-                                e_timestamp.strftime("%Y-%m-%d") + "_" + \
-                                e_timestamp.strftime("%H:%M:%S")
-
                         # If entry is new (not cached in previous update)
                         if e_timestamp > current_update:
                             entry_row = (data.feed.link,

=== modified file 'entertainerlib/backend/components/mediacache/image_cache.py'
--- entertainerlib/backend/components/mediacache/image_cache.py	2009-01-07 03:03:00 +0000
+++ entertainerlib/backend/components/mediacache/image_cache.py	2009-02-06 08:13:48 +0000
@@ -126,6 +126,7 @@
         Adds a new directory to the cache. Sub directories are
         added recursively and all files in them.
         """
+        # pylint: disable-msg=W0612
         if not os.path.isdir(path) or not os.path.exists(path):
             self.logger.error(
                 "Adding a directory to the image cache failed. " +

=== modified file 'entertainerlib/backend/components/mediacache/music_cache.py'
--- entertainerlib/backend/components/mediacache/music_cache.py	2008-08-05 02:08:27 +0000
+++ entertainerlib/backend/components/mediacache/music_cache.py	2009-02-06 08:13:48 +0000
@@ -132,6 +132,7 @@
 
     def addDirectory(self, path):
         """Add directory that contains audio files to the cache."""
+        # pylint: disable-msg=W0612
         if not os.path.isdir(path) or not os.path.exists(path):
             self.logger.error(
                 "Adding a directory to the music cache failed. " +

=== modified file 'entertainerlib/backend/components/mediacache/video_cache.py'
--- entertainerlib/backend/components/mediacache/video_cache.py	2008-11-30 18:10:48 +0000
+++ entertainerlib/backend/components/mediacache/video_cache.py	2009-02-06 08:13:48 +0000
@@ -147,6 +147,7 @@
             self.logger.debug(
                 "Adding a directory to the video cache. Path is: '" +
                 path + "'")
+            # pylint: disable-msg=W0612
             for root, dirs, files in os.walk(path):
                 for name in files:
                     self.addFile(os.path.join(root, name))

=== modified file 'entertainerlib/backend/core/connection_server.py'
--- entertainerlib/backend/core/connection_server.py	2009-01-11 01:54:48 +0000
+++ entertainerlib/backend/core/connection_server.py	2009-02-06 08:13:48 +0000
@@ -36,7 +36,8 @@
         self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             self.server_socket.bind(('localhost', port))
-        except socket.error, (value, message):
+        except socket.error, e:
+            message = e[1]
             self.logger.error("Socket failed to bind. %s" % message)
             # socket binding is critical to the backend, so exit
             sys.exit(1)
@@ -48,7 +49,7 @@
         self.active = True
         self.logger.debug("ConnectionServer waiting incoming connections")
         while self.active:
-            client_socket, address = self.server_socket.accept()
+            client_socket = self.server_socket.accept()[0]
             self.logger.debug("Incoming connection accepted")
             client_connection = ClientConnection(client_socket,
                                                  self.message_bus)

=== modified file 'entertainerlib/backend/core/message_bus.py'
--- entertainerlib/backend/core/message_bus.py	2009-01-11 01:54:48 +0000
+++ entertainerlib/backend/core/message_bus.py	2009-02-06 08:13:48 +0000
@@ -48,6 +48,7 @@
         # priorities.
         #XXX: rockstar - WTF?!  Why is there a list comprehension being used
         # and still only returning an empty list?
+        # pylint: disable-msg=W0612
         self.message_handlers = [
             [] for i in range(self.NUMBER_OF_MESSAGE_TYPES)
             ]

=== modified file 'entertainerlib/frontend/__init__.py'
--- entertainerlib/frontend/__init__.py	2008-10-13 16:23:50 +0000
+++ entertainerlib/frontend/__init__.py	2009-02-06 08:13:48 +0000
@@ -16,7 +16,7 @@
     config = Configuration()
     if config.start_auto_server():
         print "Entertainer backend starting..."
-        backend = BackendServer()
+        BackendServer()
 
     if config.tray_icon_enabled():
         init_systray()

=== modified file 'entertainerlib/frontend/gui/screens/audio_play.py'
--- entertainerlib/frontend/gui/screens/audio_play.py	2009-02-01 19:15:02 +0000
+++ entertainerlib/frontend/gui/screens/audio_play.py	2009-02-06 08:33:50 +0000
@@ -64,7 +64,7 @@
         media_player.play()
 
         # Start updating the progress bar of the PlayingTab (1/4 sec)
-        gobject.timeout_add(250, tab1._update_progress_bar, media_player)
+        gobject.timeout_add(250, tab1.update_progress_bar, media_player)
 
     def update(self, track):
         '''Called when currently playing changes tracks. The provided track

=== modified file 'entertainerlib/frontend/gui/screens/factory.py'
--- entertainerlib/frontend/gui/screens/factory.py	2009-02-04 00:01:22 +0000
+++ entertainerlib/frontend/gui/screens/factory.py	2009-02-07 17:12:21 +0000
@@ -44,7 +44,7 @@
         self.move_to_new_screen_callback = move_to_new_screen_callback
         self.change_screen_callback = change_screen_callback
 
-    def generate_screen(self, type, kwargs=None):
+    def generate_screen(self, screen_type, kwargs=None):
         '''Generate the proper screen by delegating to the proper generator.'''
 
         # The generate methods will add new key value pairs to kwargs to create
@@ -74,7 +74,7 @@
             'weather' : self._generate_weather
         }
 
-        return generator_methods[type](kwargs)
+        return generator_methods[screen_type](kwargs)
 
     def _generate_album(self, kwargs):
         '''Generate an Album screen.'''

=== modified file 'entertainerlib/frontend/gui/tabs/playing_tab.py'
--- entertainerlib/frontend/gui/tabs/playing_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/playing_tab.py	2009-02-06 08:33:50 +0000
@@ -62,7 +62,7 @@
             track.get_length_string())
         self.add(self.track_length)
 
-    def _update_progress_bar(self, player):
+    def update_progress_bar(self, player):
         '''Update the progress bar'''
         self.progress_bar.set_progress(player.get_media_position())
         self.current_pos.set_text(player.get_media_position_string())

=== modified file 'entertainerlib/frontend/gui/transitions/factory.py'
--- entertainerlib/frontend/gui/transitions/factory.py	2009-01-26 22:58:26 +0000
+++ entertainerlib/frontend/gui/transitions/factory.py	2009-02-07 17:12:21 +0000
@@ -35,11 +35,11 @@
         }
 
         if self.config.show_effects():
-            type = self.config.transition_effect()
+            kind = self.config.transition_effect()
         else:
-            type = "No effect"
+            kind = "No effect"
 
-        return generate_methods[type]()
+        return generate_methods[kind]()
 
     def _generate_slide(self):
         '''Generate a Slide transition'''

=== modified file 'entertainerlib/frontend/gui/user_interface.py'
--- entertainerlib/frontend/gui/user_interface.py	2009-02-04 00:01:22 +0000
+++ entertainerlib/frontend/gui/user_interface.py	2009-02-07 17:12:21 +0000
@@ -292,6 +292,7 @@
         @param stage: Stage object which received key pressing event
         @param event: Event object (from clutter framework)
         """
+        # pylint: disable-msg=W0212
         if event.keyval == clutter.keysyms.Return: # Enter key
             self.handle_user_event(UserEvent(UserEvent.NAVIGATE_SELECT))
         elif event.keyval == clutter.keysyms.Up: # Up arrow key
@@ -339,9 +340,9 @@
         control, gtk-widget or some other source.
         @param event: UserEvent object, defines what action has been taken
         """
-        type = event.get_type()
+        kind = event.get_type()
 
-        if(type == UserEvent.PLAYER_PLAY_PAUSE):
+        if(kind == UserEvent.PLAYER_PLAY_PAUSE):
             if self.current.is_interested_in_play_action():
                 self.current.execute_play_action()
             else:
@@ -352,80 +353,80 @@
                     self.player.play()
                     self.current.handle_user_event(event)
 
-        elif(type == UserEvent.PLAYER_STOP):
+        elif(kind == UserEvent.PLAYER_STOP):
             if self.player.is_playing():
                 self.player.stop()
                 self.current.handle_user_event(event)
 
-        elif(type == UserEvent.PLAYER_NEXT):
+        elif(kind == UserEvent.PLAYER_NEXT):
             self.player.next()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.PLAYER_PREVIOUS):
+        elif(kind == UserEvent.PLAYER_PREVIOUS):
             self.player.previous()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.PLAYER_SKIP_FORWARD):
+        elif(kind == UserEvent.PLAYER_SKIP_FORWARD):
             self.player.skip_forward()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.PLAYER_SKIP_BACKWARD):
+        elif(kind == UserEvent.PLAYER_SKIP_BACKWARD):
             self.player.skip_backward()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.NAVIGATE_UP):
-            self.current.handle_user_event(event)
-
-        elif(type == UserEvent.NAVIGATE_DOWN):
-            self.current.handle_user_event(event)
-
-        elif(type == UserEvent.NAVIGATE_LEFT):
-            self.current.handle_user_event(event)
-
-        elif(type == UserEvent.NAVIGATE_RIGHT):
-            self.current.handle_user_event(event)
-
-        elif(type == UserEvent.NAVIGATE_HOME):
+        elif(kind == UserEvent.NAVIGATE_UP):
+            self.current.handle_user_event(event)
+
+        elif(kind == UserEvent.NAVIGATE_DOWN):
+            self.current.handle_user_event(event)
+
+        elif(kind == UserEvent.NAVIGATE_LEFT):
+            self.current.handle_user_event(event)
+
+        elif(kind == UserEvent.NAVIGATE_RIGHT):
+            self.current.handle_user_event(event)
+
+        elif(kind == UserEvent.NAVIGATE_HOME):
             self.move_to_new_screen("main")
 
-        elif(type == UserEvent.NAVIGATE_CURRENTLY_PLAYING):
+        elif(kind == UserEvent.NAVIGATE_CURRENTLY_PLAYING):
             pass
 
-        elif(type == UserEvent.NAVIGATE_BACK):
+        elif(kind == UserEvent.NAVIGATE_BACK):
             if not self.history.is_empty() and (
                 self.current.get_type() != Screen.DIALOG):
                 screen = self.history.get_screen()
                 screen.update()
                 self.changeScreen(screen, Transition.BACKWARD)
 
-        elif(type == UserEvent.NAVIGATE_SELECT):
-            self.current.handle_user_event(event)
-
-        elif(type == UserEvent.NAVIGATE_CONTENT):
-            self.current.handle_user_event(event)
-
-        elif(type == UserEvent.TOGGLE_FULLSCREEN):
+        elif(kind == UserEvent.NAVIGATE_SELECT):
+            self.current.handle_user_event(event)
+
+        elif(kind == UserEvent.NAVIGATE_CONTENT):
+            self.current.handle_user_event(event)
+
+        elif(kind == UserEvent.TOGGLE_FULLSCREEN):
             self.toggle_fullscreen()
 
-        elif(type == UserEvent.USE_ASPECT_RATIO_1):
+        elif(kind == UserEvent.USE_ASPECT_RATIO_1):
             self.player.set_native_ratio()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.USE_ASPECT_RATIO_2):
+        elif(kind == UserEvent.USE_ASPECT_RATIO_2):
             self.player.set_widescreen_ratio()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.USE_ASPECT_RATIO_3):
+        elif(kind == UserEvent.USE_ASPECT_RATIO_3):
             self.player.set_zoom_ratio()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.USE_ASPECT_RATIO_4):
+        elif(kind == UserEvent.USE_ASPECT_RATIO_4):
             self.player.set_intelligent_ratio()
             self.current.handle_user_event(event)
 
-        elif(type == UserEvent.USE_NEXT_ASPECT_RATIO):
+        elif(kind == UserEvent.USE_NEXT_ASPECT_RATIO):
             pass
 
-        elif(type == UserEvent.QUIT_FRONTEND):
+        elif(kind == UserEvent.QUIT_FRONTEND):
             self.confirm_exit()
 

=== modified file 'entertainerlib/frontend/gui/widgets/grid_menu.py'
--- entertainerlib/frontend/gui/widgets/grid_menu.py	2008-12-25 01:32:18 +0000
+++ entertainerlib/frontend/gui/widgets/grid_menu.py	2009-02-06 08:13:48 +0000
@@ -175,6 +175,7 @@
         Selects the item at the passed logical_position
         @author Joshua Scotton
         """
+        # pylint: disable-msg=W0612
         target = (  int(logical_position / self.row_count),
                     int(logical_position % self.row_count))
 

=== modified file 'entertainerlib/frontend/gui/widgets/scroll_menu.py'
--- entertainerlib/frontend/gui/widgets/scroll_menu.py	2008-11-26 20:40:33 +0000
+++ entertainerlib/frontend/gui/widgets/scroll_menu.py	2009-02-07 17:12:21 +0000
@@ -86,11 +86,11 @@
         """
         #split list so that item at the index will now be at position 2
         #which is the selected index in a scroll menu
-        list = self.__items[index-2:] + self.__items[0:index-2]
+        items = self.__items[index-2:] + self.__items[0:index-2]
 
         #Basically remove all then add in the correct order
         self.remove_all()
-        for item in list:
+        for item in items:
             #Remove all doesn't remove the parent object. So in order to avoid
             #adding two parent clutter items to the item we need to remove the
             #old one first

=== modified file 'entertainerlib/frontend/gui/widgets/tab_group.py'
--- entertainerlib/frontend/gui/widgets/tab_group.py	2008-12-06 03:56:48 +0000
+++ entertainerlib/frontend/gui/widgets/tab_group.py	2009-02-07 17:12:21 +0000
@@ -199,12 +199,12 @@
         @param event: UserEvent object
         """
         if self.active:
-            type = event.get_type()
-            if type == UserEvent.NAVIGATE_LEFT:
+            event_type = event.get_type()
+            if event_type == UserEvent.NAVIGATE_LEFT:
                 self._switch_tab_to_left()
-            elif type == UserEvent.NAVIGATE_RIGHT:
+            elif event_type == UserEvent.NAVIGATE_RIGHT:
                 self._switch_tab_to_right()
-            elif type == UserEvent.NAVIGATE_DOWN and (
+            elif event_type == UserEvent.NAVIGATE_DOWN and (
                 self.tabs_list[self.current_tab].can_activate()):
                 self.set_active(False)
                 self.tabs_list[self.current_tab].set_active(True)

=== modified file 'entertainerlib/frontend/medialibrary/music.py'
--- entertainerlib/frontend/medialibrary/music.py	2009-02-01 02:14:30 +0000
+++ entertainerlib/frontend/medialibrary/music.py	2009-02-07 17:12:21 +0000
@@ -353,13 +353,11 @@
         Get the artist of this album. This is taken from the first track.
         @return: String
         """
-        various = False
         artist = self.tracks[0].get_artist()
         text = self.tracks[0].get_artist()
 
         for track in self.get_tracks():
             if track.get_artist() != artist:
-                various = True
                 text = _("Various")
                 break
             else:
@@ -388,11 +386,11 @@
         """
 
         # Check that these four fields are integers
-        for input in [tracknumber, year, rating, length]:
+        for field in [tracknumber, year, rating, length]:
             if rating == None: # By default, there is no rating for a track
                 continue
-            if type(input) != int:
-                raise TrackTypeError("%s is not an integer" % input)
+            if type(field) != int:
+                raise TrackTypeError("%s is not an integer" % field)
 
         # Check that the rating is in range 1-5
         if rating != None and rating not in range(1, 6):
@@ -599,7 +597,7 @@
         """
         self.tracks = []
 
-        (query_status, query_info) = CDDB.query(disc_id)
+        query_info = CDDB.query(disc_id)[1]
 
         # FIXME: query_info contains code that we could use instead of TRY
         # EXCEPT
@@ -616,8 +614,8 @@
                 self.album = title[title.index(' / ') + 3:]
 
                 # Get track titles
-                (read_status, read_info) = CDDB.read(query_info['category'],
-                                                     query_info['disc_id'])
+                read_info = CDDB.read(query_info['category'],
+                                      query_info['disc_id'])[1]
                 cumulative_length = 0
                 for i in range(disc_id[1]):
                     if i + 4 == len(disc_id):
@@ -637,8 +635,8 @@
                 self.album = query['title'][query['title'].index(' / ') + 3:]
 
                 # Get track titles
-                (read_status, read_info) = CDDB.read(query_info[0]['category'],
-                                                     query_info[0]['disc_id'])
+                read_info = CDDB.read(query_info[0]['category'],
+                                      query_info[0]['disc_id'])[1]
                 cumulative_length = 0
                 for i in range(disc_id[1]):
                     if i + 4 == len(disc_id):

=== modified file 'entertainerlib/tests/__init__.py'
--- entertainerlib/tests/__init__.py	2009-02-04 04:17:37 +0000
+++ entertainerlib/tests/__init__.py	2009-02-06 07:23:29 +0000
@@ -5,15 +5,13 @@
 from storm.locals import Store
 import testtools
 
-from entertainerlib.frontend.translation_setup import TranslationSetup
-TranslationSetup()
-
 from entertainerlib.backend.core.db.connection import Database
 from entertainerlib.frontend.translation_setup import TranslationSetup
 from entertainerlib.utils.configuration import Configuration
 
 TranslationSetup()
 
+
 class EntertainerTest(testtools.TestCase):
     '''Test for use in the Entertainer test suite.'''
 

=== modified file 'entertainerlib/tests/test_configuration.py'
--- entertainerlib/tests/test_configuration.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_configuration.py	2009-02-07 17:12:21 +0000
@@ -1,4 +1,5 @@
-'Tests Configuration'
+'''Tests Configuration'''
+# pylint: disable-msg=W0212
 
 __license__ = "GPLv2"
 __copyright__ = "2008, Matt Layman"
@@ -127,24 +128,24 @@
     def test_taint(self):
         '''Test tainting configuration data'''
         # Test tainting preferences data
-        type = 'preferences'
+        kind = 'preferences'
         section = 'General'
         option = 'history_size'
-        self.configuration.taint(type, section, option)
-        key = "%s %s %s" % (type, section, option)
+        self.configuration.taint(kind, section, option)
+        key = "%s %s %s" % (kind, section, option)
         self.assertEqual(self.configuration._tainted[key], '8')
 
         # Test tainting content data
-        type = 'content'
+        kind = 'content'
         section = 'Videos'
         option = 'download_metadata'
-        self.configuration.taint(type, section, option)
-        key = "%s %s %s" % (type, section, option)
+        self.configuration.taint(kind, section, option)
+        key = "%s %s %s" % (kind, section, option)
         self.assertEqual(self.configuration._tainted[key], 'True')
 
         # Test the bad branch
-        type = 'bogus'
-        self.assertRaises(Exception, self.configuration.taint, type, section,
+        kind = 'bogus'
+        self.assertRaises(Exception, self.configuration.taint, kind, section,
             option)
 
     def test_taint_in_memory(self):

=== modified file 'entertainerlib/tests/test_frontendfeedentry.py'
--- entertainerlib/tests/test_frontendfeedentry.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_frontendfeedentry.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 '''Tests feed entries on the frontend'''
+# pylint: disable-msg=W0212
 
 __licence__ = "GPLv2"
 __copyright__ = "2008, Joshua Scotton"

=== modified file 'entertainerlib/tests/test_imagemenuitem.py'
--- entertainerlib/tests/test_imagemenuitem.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_imagemenuitem.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 """Tests ImageMenuItem"""
+# pylint: disable-msg=W0212
 
 __license__ = "GPLv2"
 __copyright__ = "2008, Matt Layman"
@@ -47,10 +48,10 @@
     def testRatio(self):
         """Test that ratio correctly calculates the expected heights"""
         texture2 = Texture(self.filename)
-        image2 = ImageMenuItem(.1, .5, texture2)
+        ImageMenuItem(.1, .5, texture2)
         self.assertEqual(texture2.get_height(), 68)
 
         texture3 = Texture(self.filename)
-        image3 = ImageMenuItem(.1, 2, texture3)
+        ImageMenuItem(.1, 2, texture3)
         self.assertEqual(texture3.get_height(), 272)
 

=== modified file 'entertainerlib/tests/test_imagethumbnailer.py'
--- entertainerlib/tests/test_imagethumbnailer.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_imagethumbnailer.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 '''ImageThumbnailer test'''
+# pylint: disable-msg=W0212
 
 import os
 

=== modified file 'entertainerlib/tests/test_label.py'
--- entertainerlib/tests/test_label.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_label.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 """Tests Label"""
+# pylint: disable-msg=W0212
 
 __license__ = "GPLv2"
 __copyright__ = "2008, Matt Layman"

=== modified file 'entertainerlib/tests/test_lyricsdownloader.py'
--- entertainerlib/tests/test_lyricsdownloader.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_lyricsdownloader.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 '''Tests LyricsDownloader'''
+# pylint: disable-msg=W0212
 
 __licence__ = "GPLv2"
 __copyright__ = "2008, Michael Charclo"

=== modified file 'entertainerlib/tests/test_music.py'
--- entertainerlib/tests/test_music.py	2009-02-04 04:17:37 +0000
+++ entertainerlib/tests/test_music.py	2009-02-07 17:12:21 +0000
@@ -48,14 +48,14 @@
         for i in range(2):
             for j in range(2):
                 for k in range(2):
-                    sum = i + j + k # to get unique track numbers for ablums
+                    total = i + j + k # to get unique track numbers for albums
                     db_row = ('/filename/%s' % str(i) + str(j) + str(k),
                               'title%s' % str(i) + str(j),
                               'artist0',
                               'album%d' % j,
                               'genre%d' % i,
                               i + j + k, # length
-                              sum, # tracknumber
+                              total, # tracknumber
                               i, # bitrate
                               'comment%d' % i,
                               i  # year
@@ -177,8 +177,7 @@
         album_artist = "artist0 - album0"
         album_artist = album_artist.encode("base64")
         album_art = os.path.join(self.art_path, album_artist + ".jpg")
-        file = open(album_art, "wb")
-        file.close()
+        open(album_art, "wb").close()
         result = self.track.get_album_art_url(self.cursor)
         self.assertEqual(result, album_art)
         if os.path.exists(album_art):
@@ -405,8 +404,7 @@
         album_artist = "artist0 - album1"
         album_artist = album_artist.encode("base64")
         album_art = os.path.join(self.art_path, album_artist + ".jpg")
-        file = open(album_art, "wb")
-        file.close()
+        open(album_art, "wb").close()
         self.assertTrue(self.album.has_album_art())
         if os.path.exists(album_art):
             os.remove(album_art)

=== modified file 'entertainerlib/tests/test_screenfactory.py'
--- entertainerlib/tests/test_screenfactory.py	2009-02-04 04:20:05 +0000
+++ entertainerlib/tests/test_screenfactory.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 '''Tests ScreenFactory'''
+# pylint: disable-msg=W0212
 
 __license__ = 'GPLv2'
 __copyright__ = '2009, Matt Layman'

=== modified file 'entertainerlib/tests/test_scrollarea.py'
--- entertainerlib/tests/test_scrollarea.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_scrollarea.py	2009-02-06 08:13:48 +0000
@@ -20,6 +20,7 @@
 
         # Get a workable amount of text
         text = "Here is the start. "
+        # pylint: disable-msg=W0612
         for i in range(0, 100):
             text += "Here is another sentence. "
 

=== modified file 'entertainerlib/tests/test_texture.py'
--- entertainerlib/tests/test_texture.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_texture.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 """Tests Texture"""
+# pylint: disable-msg=W0212
 
 __license__ = "GPLv2"
 __copyright__ = "2008, Matt Layman"

=== modified file 'entertainerlib/tests/test_transitionfactory.py'
--- entertainerlib/tests/test_transitionfactory.py	2009-02-04 04:17:37 +0000
+++ entertainerlib/tests/test_transitionfactory.py	2009-02-07 17:12:21 +0000
@@ -1,4 +1,5 @@
 '''Tests TransitionFactory'''
+# pylint: disable-msg=W0212
 
 __license__ = 'GPLv2'
 __copyright__ = '2009, Matt Layman'
@@ -59,12 +60,12 @@
             'Zoom and fade' : ZoomAndFade
         }
         # Test all possible transitions
-        for type in values_to_test.keys():
+        for key in values_to_test.keys():
             self.config.write_preference_value('General', 'transition_effect',
-                type)
+                key)
             self.config.update_configuration()
             transition = self.factory.generate_transition()
-            self.assertTrue(isinstance(transition, values_to_test[type]))
+            self.assertTrue(isinstance(transition, values_to_test[key]))
 
         # Test the path when the user doesn't have effects
         self.config.write_preference_value('General', 'show_effects', 'False')

=== modified file 'entertainerlib/tests/test_videothumbnailer.py'
--- entertainerlib/tests/test_videothumbnailer.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_videothumbnailer.py	2009-02-06 08:33:50 +0000
@@ -1,4 +1,5 @@
 '''Tests VideoThumbnailer'''
+# pylint: disable-msg=W0212
 
 import os
 

=== modified file 'entertainerlib/tests/test_weather.py'
--- entertainerlib/tests/test_weather.py	2009-01-31 21:36:56 +0000
+++ entertainerlib/tests/test_weather.py	2009-02-07 17:49:58 +0000
@@ -4,6 +4,8 @@
 __copyright__ = "2008, Jamie Bennett"
 __author__ = "Jamie Bennett <[e-mail]>"
 
+from datetime import datetime
+
 from entertainerlib.tests import EntertainerTest
 from entertainerlib.utils.weather import Weather
 
@@ -30,7 +32,8 @@
         forecasts = self.weather.get_forecasts()
         try:
             today = forecasts[0]
-            self.assertEqual(today["Day"], _("Today"))
+            day = datetime.utcnow().strftime('%a')
+            self.assertEqual(str(today["Day"]), day)
         except:
             self.fail()
 

=== modified file 'entertainerlib/utils/configuration.py'
--- entertainerlib/utils/configuration.py	2009-01-26 18:28:26 +0000
+++ entertainerlib/utils/configuration.py	2009-02-07 17:12:21 +0000
@@ -508,18 +508,18 @@
         """
         return self.cfg_dir
 
-    def taint(self, type, section, option):
+    def taint(self, kind, section, option):
         '''Taint any data that is written to config files so that it can be
         returned to a known state later'''
-        if type == 'content':
+        if kind == 'content':
             value = self.content_config.get(section, option)
-        elif type == 'preferences':
+        elif kind == 'preferences':
             value = self.preferences.get(section, option)
         else:
             raise Exception(
                 "Taint type must be either 'content' or 'preferences'")
 
-        key = "%s %s %s" % (type, section, option)
+        key = "%s %s %s" % (kind, section, option)
         self._tainted[key] = value
 
     def taint_in_memory(self, callback, kwargs):

=== modified file 'entertainerlib/utils/content_management_dialog.py'
--- entertainerlib/utils/content_management_dialog.py	2008-10-31 00:43:37 +0000
+++ entertainerlib/utils/content_management_dialog.py	2009-02-07 17:12:21 +0000
@@ -400,11 +400,11 @@
 
     def on_button_open_list_clicked(self, widget):
         """Opens the open feed source dialog"""
-        open = OpenFeedSourceDialog(self.widgets.get_widget("treeview_feeds"),
-            self.feeds)
-        open.dialog.connect("destroy", open.on_closeButton_clicked)
-        open.dialog.hide()
-        open.dialog.destroy()
+        open_dialog = OpenFeedSourceDialog(
+            self.widgets.get_widget("treeview_feeds"), self.feeds)
+        open_dialog.dialog.connect("destroy", open.on_closeButton_clicked)
+        open_dialog.dialog.hide()
+        open_dialog.dialog.destroy()
 
     def on_fetch_interval_spinbutton_value_changed(self, widget):
         self.config.write_content_value("RSS", "fetch_interval",
@@ -449,8 +449,6 @@
         Open location search dialog
         @param widget: GTK-Widget
         """
-        add_button = self.widgets.get_widget(
-            "location_add_button").set_sensitive(False)
         location_dialog = self.widgets.get_widget("weather_search_dialog")
         location_dialog.set_title(_("Add location"))
 
@@ -470,7 +468,6 @@
         """
         widget = self.widgets.get_widget("treeview_locations")
         model = widget.get_model()
-        selection = widget.get_selection().get_selected()
         self.weather_locations = []
         str_folders = ""
         self.config.write_content_value("Weather", "location", str_folders)
@@ -754,7 +751,7 @@
                 False)
             self.widgets.get_widget("treeview_locations").set_sensitive(False)
 
-    def add_to_model_and_config(self, selected_folder, model, folders, type):
+    def add_to_model_and_config(self, selected_folder, model, folders, kind):
         """
         Add selected_folder to the model and the folders list while updating
         the configuration item section specified by type
@@ -770,10 +767,11 @@
             if "" in folders:
                 folders.remove("")
             str_folders = ";".join(folders)
-            self.config.write_content_value(type, "folders", str_folders)
+            self.config.write_content_value(kind, "folders", str_folders)
 
-    def init_model(self, model, list):
+    def init_model(self, model, items):
         """Fill model with items from supplied list"""
-        for i in range(len(list)):
-            if not str(list[i]).strip() == "":
-                model.insert(i, [list[i]])
+        for i in range(len(items)):
+            if not str(items[i]).strip() == "":
+                model.insert(i, [items[i]])
+

=== modified file 'entertainerlib/utils/feed_utils.py'
--- entertainerlib/utils/feed_utils.py	2009-01-26 18:28:26 +0000
+++ entertainerlib/utils/feed_utils.py	2009-02-07 17:12:21 +0000
@@ -110,7 +110,7 @@
         @param filename The OPML file
         @return list(String) List of RSS feed urls
         """
-        list = []
+        feeds = []
         if os.path.isfile(filename):
             #this loads the xml from the opml file into xmldoc
             xmldoc = minidom.parse(filename)
@@ -118,16 +118,16 @@
             xmldoc = minidom.parse(urllib.urlopen(filename))
         #the rss feeds are in the xmlUrl attributes of the outline tags
         #we loop through all the outline nodes in the opml file and add
-        #the contents of any xmlUrl attributes to the list variable
+        #the contents of any xmlUrl attributes to the feeds variable
         for node in xmldoc.getElementsByTagName('outline'):
             url = node.getAttribute('xmlUrl')
             #drop any items which are .opml files or empty string
             #We do not recursively parse opml links as we could end up with an
             #infinite loop
             if (url.strip() != "") and ((url.strip() [-5:]) != ".opml"):
-                list.append(url)
+                feeds.append(url)
         #returns the list of rss feeds from the opml file
-        return list
+        return feeds
 
     def get_liferea_opml(self, home_dir=os.path.expanduser("~")):
         """

=== modified file 'entertainerlib/utils/open_feed_source_dialog.py'
--- entertainerlib/utils/open_feed_source_dialog.py	2008-12-19 04:06:18 +0000
+++ entertainerlib/utils/open_feed_source_dialog.py	2009-02-07 17:12:21 +0000
@@ -68,10 +68,10 @@
                 gtk.RESPONSE_OK))
 
         #set dialog up to filter for only opml files
-        filter = gtk.FileFilter()
-        filter.set_name(_("OPML files"))
-        filter.add_pattern("*.opml")
-        dialog.add_filter(filter)
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("OPML files"))
+        file_filter.add_pattern("*.opml")
+        dialog.add_filter(file_filter)
 
         #set dialog up to allow multiple selections
         dialog.set_select_multiple(True)

=== modified file 'entertainerlib/utils/preferences_dialog.py'
--- entertainerlib/utils/preferences_dialog.py	2009-01-27 01:51:57 +0000
+++ entertainerlib/utils/preferences_dialog.py	2009-02-07 17:12:21 +0000
@@ -81,10 +81,10 @@
         dialog = gtk.FileChooserDialog(_("Select theme package file"),
             None, gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL,
             gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK), None)
-        filter = gtk.FileFilter()
-        filter.set_name(_("Theme package (tar.gz)"))
-        filter.add_pattern("*.tar.gz")
-        dialog.add_filter(filter)
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("Theme package (tar.gz)"))
+        file_filter.add_pattern("*.tar.gz")
+        dialog.add_filter(file_filter)
         status = dialog.run()
 
         # If theme was selected with file chooser
@@ -109,7 +109,7 @@
                     theme_name = element[:-11]
                     is_theme = True
 
-            # Install theme
+            # Install them
             if is_theme:
                 tar.extractall(os.path.join(self.config.get_cfg_dir(),
                     'themes'))
@@ -162,8 +162,8 @@
         author.set_text(theme.getAuthor())
         licence = self.widgets.get_widget("licence_label")
         licence.set_text(theme.getLicence())
-        copyright = self.widgets.get_widget("copyright_label")
-        copyright.set_text(theme.getCopyright())
+        copyright_label = self.widgets.get_widget("copyright_label")
+        copyright_label.set_text(theme.getCopyright())
         comment = self.widgets.get_widget("comment_label")
         comment.set_text(theme.getComment())
 
@@ -257,7 +257,7 @@
 
         # Set current theme selected in theme list
         try:
-            iter = model.get_iter_first()
+            index = model.get_iter_first()
             unselected = True
             index_counter = 0
             while(unselected):
@@ -265,7 +265,7 @@
                 if name == current_theme:
                     unselected = False
                     themelist_widget.set_cursor(index_counter)
-                iter = model.iter_next(iter)
+                index = model.iter_next(index)
                 index_counter += 1
         except:
             pass # Error in configfile

=== modified file 'entertainerlib/utils/theme.py'
--- entertainerlib/utils/theme.py	2008-12-15 22:51:24 +0000
+++ entertainerlib/utils/theme.py	2009-02-06 08:13:48 +0000
@@ -91,6 +91,7 @@
         """Add every .png files to the image array"""
         img_path = os.path.join(self.theme_path, "images")
 
+        # pylint: disable-msg=W0612
         for root, dirs, files in os.walk(os.path.join(img_path, folder)):
             for filename in files:
                 ext = filename[filename.rfind('.') + 1 :].lower()

=== modified file 'entertainerlib/utils/thumbnailer.py'
--- entertainerlib/utils/thumbnailer.py	2009-01-11 02:13:04 +0000
+++ entertainerlib/utils/thumbnailer.py	2009-02-07 17:12:21 +0000
@@ -22,17 +22,17 @@
     MAX_SIZE = 512
     THUMB_QUALITY = 85
 
-    def __init__(self, filename, type):
+    def __init__(self, filename, thumb_type):
 
         self.config = Configuration()
-        thumb_dir = os.path.join(self.config.THUMB_DIR, type)
+        thumb_dir = os.path.join(self.config.THUMB_DIR, thumb_type)
         self.filename = filename
         if hashlib:
-            hash = hashlib.md5()
+            filehash = hashlib.md5()
         else:
-            hash = md5.new()
-        hash.update(self.filename)
-        self.filename_hash = hash.hexdigest()
+            filehash = md5.new()
+        filehash.update(self.filename)
+        self.filename_hash = filehash.hexdigest()
 
         if not os.path.exists(self.filename):
             raise ThumbnailerException(
@@ -46,7 +46,8 @@
                 raise ThumbnailerException(
                     'Thumbnailer filename is a folder : %s' % self.filename)
         else:
-            raise ThumbnailerException('Unknown thumbnail type : %s' % type)
+            raise ThumbnailerException('Unknown thumbnail type : %s' % (
+                thumb_type))
 
     def get_hash(self):
         '''Get the hash of the filename'''

=== modified file 'entertainerlib/utils/video_thumbnailer.py'
--- entertainerlib/utils/video_thumbnailer.py	2009-01-11 02:25:00 +0000
+++ entertainerlib/utils/video_thumbnailer.py	2009-02-07 17:12:21 +0000
@@ -69,15 +69,15 @@
             self._current_frame = None
             return frame
 
-        def buffer_probe(self, pad, buffer):
+        def buffer_probe(self, pad, buff):
             '''Buffer the probe'''
-            caps = buffer.caps
+            caps = buff.caps
             if caps != None:
                 s = caps[0]
                 self.width = s['width']
                 self.height = s['height']
-            if self.width != None and self.height != None and buffer != None:
-                self.set_current_frame(buffer.data)
+            if self.width != None and self.height != None and buff != None:
+                self.set_current_frame(buff.data)
             return True
 
         def reset(self):
@@ -188,16 +188,14 @@
         sink_size = (self._sink.width, self._sink.height)
 
         try:
-            duration, format = self._pipeline.query_duration(gst.FORMAT_TIME)
-        except Exception, e:
+            duration = self._pipeline.query_duration(gst.FORMAT_TIME)[0]
+        except Exception:
             ## FIXME: precise this exception
             #Gstreamer cannot determine the media duration using
             #playing-thumbnailing for file
             self.set_pipeline_state(self._pipeline, gst.STATE_NULL)
-            # XXX: rockstar - size is undefined.  I need to figure out wtf I
-            # was doing
-            #img = self._play_for_thumb(sink_size, size, 0)
-            #play found img
+
+            img = self._play_for_thumb(sink_size, 0)
             if img:
                 img.save(self._thumb_file)
                 return
@@ -209,7 +207,7 @@
                 if img:
                     img.save(self._thumb_file)
                     return
-            except VideoThumbnailerException, e:
+            except VideoThumbnailerException:
                 #Fallback: No Image found in seek_for, falling back to
                 #play_for_thumb
                 self.set_pipeline_state(self._pipeline, gst.STATE_NULL)
@@ -228,7 +226,7 @@
         '''
         Plays the video file to gather information for generating a thumbnail
         '''
-        id = None
+        fileid = None
         self._img = None
 
         if duration >= 250000:
@@ -249,7 +247,7 @@
         ## How often Proceed?
         self._counter = 5
 
-        def buffer_probe(pad, buffer):
+        def _buffer_probe(pad, buff):
             '''Probe the buffer'''
             ## Proceed only every 5th frame!
             if self._every_co < self._every:
@@ -258,9 +256,9 @@
             self._every_co = 0
 
             try:
-                img = Image.frombuffer("RGB", sink_size, buffer,
+                img = Image.frombuffer("RGB", sink_size, buff,
                                                 "raw", "RGB",0, 1)
-            except Exception, e:
+            except Exception:
                 #Invalid frame
                 pass
             else:
@@ -276,7 +274,7 @@
 
                     #Releasing self._img
                     self._sink.reset()
-                    pad.remove_buffer_probe(id)
+                    pad.remove_buffer_probe(fileid)
                     self._blocker.set()
                     return
 
@@ -285,20 +283,17 @@
                 #Counter off, resetting blocker
                 # Is it better to return no image instead of a 'boring' one?
                 if self._img:
-                    # XXX: rockstar - WTF?!  Where am I getting size?
-                    #self._img.thumbnail((size, size), Image.BILINEAR)
+                    self._img.thumbnail(sink_size, Image.BILINEAR)
                     if img.mode != 'RGBA':
                         img = img.convert(mode='RGBA')
 
                 self._sink.reset()
-                pad.remove_buffer_probe(id)
+                pad.remove_buffer_probe(fileid)
                 self._blocker.set()
 
 
         self.set_state_blocking(self._pipeline, gst.STATE_PLAYING)
 
-        pad = self._sink.get_pad('sink')
-        id = pad.add_buffer_probe(buffer_probe)
         self._blocker.wait()
         self._pipeline.set_state(gst.STATE_NULL)
         return self._img

=== modified file 'pylintrc'
--- pylintrc	2009-01-06 01:50:25 +0000
+++ pylintrc	2009-02-07 17:12:21 +0000
@@ -53,6 +53,10 @@
 #enable-msg=
 
 # Disable the message(s) with the given id(s).
+# E1101 and E1103 are broken, as it reports non-existing members when the
+# member is inherited.
+# W0142 checks for * or ** argument magic
+
 # XXX: rockstar - W0613 is a warning about unused arguments.  This can be a
 # little misleading, since cluttergst needs a few parameters that pylint
 # doesn't see getting used
@@ -60,18 +64,13 @@
 # XXX: rockstar - W0702 constrains calls to except to specific Exceptions
 # XXX: rockstar - W0232 ensures that an __init__ method is always present
 # XXX: rockstar - W0511 checks for XXX, TODO, and FIXME
-# XXX: rockstar - W0612 checks for unused variables
 # XXX: rockstar - W0201 checks for attributes defined outside init
-# XXX: rockstar - E1101 and E1103 are broken, as it reports non-existing
-# members when the member is inherited
 # XXX: rockstar - W0703 er, I have no idea what it does
-# XXX: rockstar - W0212 stops access to protected members
 # XXX: rockstar - W0622 stops one from redefining builtins
 # XXX: rockstar - W0704 checks for empty except
 # XXX: rockstar - W0221 checks for inherited function signatures for similar
 # args
-# XXX: rockstar - W0142 checks for * or ** argument magic
-disable-msg=I0011,R0201,R0801,R0901,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R0923,W0613,C0103,W0702,W0232,W0511,W0612,W0201,E1101,W0703,W0212,W0622,W0704,E1103,W0221,W0142
+disable-msg=I0011,R0201,R0801,R0901,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R0923,W0613,C0103,W0702,W0232,W0511,W0201,E1101,W0703,W0704,E1103,W0221,W0142
 
 
 [REPORTS]

=== modified file 'setup.py'
--- setup.py	2009-01-26 17:33:36 +0000
+++ setup.py	2009-02-07 17:12:21 +0000
@@ -33,10 +33,10 @@
     result = []
     if isinstance(dirs, str):
         dirs = [dirs]
-    for dir in dirs:
-        for root, dirs, files in os.walk(dir):
+    for directory in dirs:
+        for root, dirs, files in os.walk(directory):
             dest = os.path.join(dest_root, root)
-            source_files = [os.path.join(root, file) for file in files]
+            source_files = [os.path.join(root, a_file) for a_file in files]
             result.append((dest, source_files))
     return result
 

=== modified file 'tools/translations_generator.py'
--- tools/translations_generator.py	2009-01-06 23:36:47 +0000
+++ tools/translations_generator.py	2009-02-07 17:12:21 +0000
@@ -50,13 +50,14 @@
         headers = []
 
         # Cycle through all the files and collect the necessary data
+        # pylint: disable-msg=W0612
         for root, dirs, files in os.walk(self.lib_dir):
             if self.exclude in root:
                 continue
-            for file in files:
-                full_path = os.path.join(root, file)
+            for filename in files:
+                full_path = os.path.join(root, filename)
 
-                (path, ext) = os.path.splitext(full_path)
+                ext = os.path.splitext(full_path)[1]
                 if ext == '.py':
                     files_to_translate.append(full_path)
                 elif ext == '.glade':