Use new name for GetoptError, and pass it two arguments

Use re module instead of regex

diff --git a/Tools/scripts/findlinksto.py b/Tools/scripts/findlinksto.py
index e4731a589bbb4766315c8fdfbd4b1dccfe425c71..00d4a187c88778f91ebeff7a89110e2b119425c3 100755 (executable)
--- a/Tools/scripts/findlinksto.py
+++ b/Tools/scripts/findlinksto.py
@@ -6,21 +6,21 @@
 
 import os
 import sys
-import regex
+import re
 import getopt
 
 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], '')
         if len(args) < 2:
-            raise getopt.error, 'not enough arguments'
-    except getopt.error, msg:
+            raise getopt.GetoptError('not enough arguments', None)
+    except getopt.GetoptError, msg:
         sys.stdout = sys.stderr
         print msg
         print 'usage: findlinksto pattern directory ...'
         sys.exit(2)
     pat, dirs = args[0], args[1:]
-    prog = regex.compile(pat)
+    prog = re.compile(pat)
     for dirname in dirs:
         os.path.walk(dirname, visit, prog)
 
@@ -34,7 +34,7 @@ def visit(prog, dirname, names):
         name = os.path.join(dirname, name)
         try:
             linkto = os.readlink(name)
-            if prog.search(linkto) >= 0:
+            if prog.search(linkto) is not None:
                 print name, '->', linkto
         except os.error:
             pass