Switched check_sources.py from getopt to optparse

utils/check_sources.py

@@ -12,8 +12,8 @@
 """
 
 import sys, os, re
-import getopt
 import cStringIO
+from optparse import OptionParser
 from os.path import join, splitext, abspath
 
 
@@ -165,34 +165,32 @@ def check_xhtml(fn, lines):
 
 
 def main(argv):
-    try:
+    parser = OptionParser(usage='Usage: %prog [-v] [-i ignorepath]* [path]')
-        gopts, args = getopt.getopt(argv[1:], "vi:")
+    parser.add_option('-v', '--verbose', dest='verbose', default=False,
-    except getopt.GetoptError:
+                      action='store_true')
-        print "Usage: %s [-v] [-i ignorepath]* [path]" % argv[0]
+    parser.add_option('-i', '--ignore-path', dest='ignored_paths',
-        return 2
+                      default=[], action='append')
-    opts = {}
+    options, args = parser.parse_args(argv[1:])
-    for opt, val in gopts:
-        if opt == '-i':
-            val = abspath(val)
-        opts.setdefault(opt, []).append(val)
 
     if len(args) == 0:
         path = '.'
     elif len(args) == 1:
         path = args[0]
     else:
-        print "Usage: %s [-v] [-i ignorepath]* [path]" % argv[0]
+        print args
-        return 2
+        parser.error('No more then one path supported')
 
-    verbose = '-v' in opts
+    verbose = options.verbose
+    ignored_paths = set(abspath(p) for p in options.ignored_paths)
 
     num = 0
     out = cStringIO.StringIO()
 
     for root, dirs, files in os.walk(path):
-        if '.svn' in dirs:
+        for vcs_dir in ['.svn', '.hg', '.git']:
-            dirs.remove('.svn')
+            if vcs_dir in dirs:
-        if '-i' in opts and abspath(root) in opts['-i']:
+                dirs.remove(vcs_dir)
+        if abspath(root) in ignored_paths:
             del dirs[:]
             continue
         in_check_pkg = root.startswith('./sphinx')
@@ -201,7 +199,7 @@ def main(argv):
             fn = join(root, fn)
             if fn[:2] == './': fn = fn[2:]
 
-            if '-i' in opts and abspath(fn) in opts['-i']:
+            if abspath(fn) in ignored_paths:
                 continue
 
             ext = splitext(fn)[1]