Merge lp:~dobey/ubuntuone-dev-tools/lint-ignores into lp:ubuntuone-dev-tools

[dobey]

Add -i,--ignore option to u1lint to ignore paths

You can test by running ./bin/u1trial, and then running ./bin/u1trial -i bin/u1trial, to see that it will no longer print the XXX/TODO/FIXME warning test that is there.

[Natalia Bidart (nataliabidart)]

I tested this inside the control panel branch and does not seem to work. Command used to try was:

nessita@dali:~/canonical/u1/controlpanel/fix-809363$ ../../devtools/review_lint-ignores/bin/u1lint --ignore ubuntuone/controlpanel/gui/qt/ui/

And I got all the errors from the generated ui files.

review: Needs Fixing

[lp:~dobey/ubuntuone-dev-tools/lint-ignores]

38. By dobey on 2011-07-13

Make the path or file statement true for the ignored list check

39. By dobey on 2011-07-14

Check the path against all ignored paths, to deal with path vs file

40. By dobey on 2011-07-14

Doh, don't use empty default for ignored as it ignores everything

[Natalia Bidart (nataliabidart)]

Works great!

review: Approve

=== modified file 'bin/u1lint'
--- bin/u1lint	2011-04-13 14:44:11 +0000
+++ bin/u1lint	2011-07-14 17:29:43 +0000
@@ -123,9 +123,10 @@
         config.read([PYLINTRC])
 
         # pylint: disable=E1103
-        return config.get("MASTER", "ignore").split(",")
+        return [os.path.join(SRCDIR, item) for item in \
+                    config.get("MASTER", "ignore").split(",")]
     except (TypeError, ConfigParser.NoOptionError):
-        return None
+        return []
     # pylint: enable=E1103
 
 def _group_lines_by_file(data):
@@ -178,17 +179,20 @@
     return pyfiles
 
 
-def main():
+def main(options=None, args=None):
     """Do the deed."""
+    from optparse import OptionParser
+    usage = '%prog [options]'
+    parser = OptionParser(usage=usage)
+    parser.add_option('-i', '--ignore', dest='ignored', default=None,
+                       help='comma-separated paths or files, to ignore')
+    (options, args) = parser.parse_args()
+
     failed = False
     ignored = _read_pylintrc_ignored()
-
-    # So that we can match the path correctly
-    if ignored:
-        moreignores = [os.path.join(SRCDIR, item) for item in ignored]
-        ignored.extend(moreignores)
-    else:
-        ignored = []
+    if options.ignored:
+        ignored.extend([os.path.join(SRCDIR, item) for item in \
+                            map(str.strip, options.ignored.split(','))])
 
     if os.environ.get('USE_PYFLAKES'):
         pylint_args = get_subprocess_start_info('pyflakes')
@@ -202,8 +206,16 @@
 
     for path in _find_files():
         is_build = path.startswith(os.path.join(SRCDIR, "_build"))
-        if path not in ignored and not is_build:
-            pylint_args.append(path)
+        is_ignored = False
+        if path in ignored:
+            continue
+        for ignored_path in ignored:
+            if path.startswith(ignored_path):
+                is_ignored = True
+                break
+        if is_build or is_ignored:
+            continue
+        pylint_args.append(path)
 
     sp = subprocess.Popen(pylint_args,
                           bufsize=4096, stdout=subprocess.PIPE)