Merge lp:~mblayman/entertainer/pylint-w0141 into lp:entertainer

[Matt Layman]

[Matt Layman (mblayman)]

Fixed W0141.

[Matt Layman (mblayman)]

=== modified file 'entertainerlib/utils/EXIF.py'
--- entertainerlib/utils/EXIF.py 2008-08-16 04:28:47 +0000
+++ entertainerlib/utils/EXIF.py 2009-01-04 23:22:07 +0000
@@ -1,4 +1,4 @@
-# pylint: disable-msg=E0011,W0311,C0301,C0302,C0111,C0322,W0621
+# pylint: disable-msg=E0011,W0311,C0301,C0302,C0111,C0322,W0621,W0141
 # Library to extract EXIF information in digital camera image files
 #
 # To use this library call with:

=== modified file 'entertainerlib/utils/albumart_downloader.py'
--- entertainerlib/utils/albumart_downloader.py 2008-08-07 01:17:29 +0000
+++ entertainerlib/utils/albumart_downloader.py 2009-01-04 23:22:07 +0000
@@ -290,6 +290,10 @@
     def get_best_match_urls (self, search_results):
         """Return tuple of URL's to large and medium cover of the best match"""
         # Default to "no match", our results must match our criteria
+
+ # This code comes from Rhythmbox so we can't control the use of 'filter'
+ # pylint: disable-msg=W0141
+
         best_match = None

         for result in search_results:

=== modified file 'pylintrc'
--- pylintrc 2008-10-25 16:41:22 +0000
+++ pylintrc 2009-01-04 23:22:07 +0000
@@ -73,9 +73,8 @@
 # XXX: rockstar - W0102 checks for dangerous default values
 # XXX: rockstar - W0142 checks for * or ** argument magic
 # XXX: rockstar - W0331 checks for the use of <>
-# XXX: rockstar - W0141 checks for the builtin function filter()
 # XXX: rockstar - W0402 check for deprecated modules
-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,W0102,W0142,W0331,W0141,W0402
+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,W0102,W0142,W0331,W0402

 [REPORTS]

[Paul Hummer (rockstar)]

review: Approve