[Python-checkins] python/dist/src/Tools/scripts findlinksto.py,1.8,1.9

akuchling@users.sourceforge.net akuchling@users.sourceforge.net
Thu, 06 Feb 2003 11:55:37 -0800


Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv17760

Modified Files:
	findlinksto.py 
Log Message:
Use new name for GetoptError, and pass it two arguments
Use re module instead of regex


Index: findlinksto.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/findlinksto.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** findlinksto.py	17 Jan 2001 08:48:39 -0000	1.8
--- findlinksto.py	6 Feb 2003 19:55:35 -0000	1.9
***************
*** 7,11 ****
  import os
  import sys
! import regex
  import getopt
  
--- 7,11 ----
  import os
  import sys
! import re
  import getopt
  
***************
*** 14,19 ****
          opts, args = getopt.getopt(sys.argv[1:], '')
          if len(args) < 2:
!             raise getopt.error, 'not enough arguments'
!     except getopt.error, msg:
          sys.stdout = sys.stderr
          print msg
--- 14,19 ----
          opts, args = getopt.getopt(sys.argv[1:], '')
          if len(args) < 2:
!             raise getopt.GetoptError('not enough arguments', None)
!     except getopt.GetoptError, msg:
          sys.stdout = sys.stderr
          print msg
***************
*** 21,25 ****
          sys.exit(2)
      pat, dirs = args[0], args[1:]
!     prog = regex.compile(pat)
      for dirname in dirs:
          os.path.walk(dirname, visit, prog)
--- 21,25 ----
          sys.exit(2)
      pat, dirs = args[0], args[1:]
!     prog = re.compile(pat)
      for dirname in dirs:
          os.path.walk(dirname, visit, prog)
***************
*** 35,39 ****
          try:
              linkto = os.readlink(name)
!             if prog.search(linkto) >= 0:
                  print name, '->', linkto
          except os.error:
--- 35,39 ----
          try:
              linkto = os.readlink(name)
!             if prog.search(linkto) is not None:
                  print name, '->', linkto
          except os.error: