[Python-checkins] python/dist/src/Tools/scripts sum5.py,1.5,1.6

[akuchling@users.sourceforge.net]

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

Modified Files:
	sum5.py 
Log Message:
Don't use 'file' as a variable name
Modernize the code a bit
Add docstring


Index: sum5.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/sum5.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sum5.py	11 Sep 2002 20:36:01 -0000	1.5
--- sum5.py	13 May 2003 17:38:05 -0000	1.6
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! # print md5 checksum for files
  
  bufsize = 8096
--- 1,7 ----
  #! /usr/bin/env python
  
! """Python utility to print MD5 checksums of argument files.
! """
! 
  
  bufsize = 8096
***************
*** 18,37 ****
  import sys
  import os
  import md5
- import regsub
- 
- StringType = type('')
- FileType = type(sys.stdin)
  
  def sum(*files):
      sts = 0
!     if files and type(files[-1]) == FileType:
          out, files = files[-1], files[:-1]
      else:
          out = sys.stdout
!     if len(files) == 1 and type(files[0]) != StringType:
          files = files[0]
      for f in files:
!         if type(f) == StringType:
              if f == '-':
                  sts = printsumfp(sys.stdin, '<stdin>', out) or sts
--- 20,36 ----
  import sys
  import os
+ import getopt
  import md5
  
  def sum(*files):
      sts = 0
!     if files and isinstance(files[-1], file):
          out, files = files[-1], files[:-1]
      else:
          out = sys.stdout
!     if len(files) == 1 and not isinstance(files[0], str):
          files = files[0]
      for f in files:
!         if isinstance(f, str):
              if f == '-':
                  sts = printsumfp(sys.stdin, '<stdin>', out) or sts
***************
*** 42,58 ****
      return sts
  
! def printsum(file, out = sys.stdout):
      try:
!         fp = open(file, rmode)
      except IOError, msg:
!         sys.stderr.write('%s: Can\'t open: %s\n' % (file, msg))
          return 1
      if fnfilter:
!         file = fnfilter(file)
!     sts = printsumfp(fp, file, out)
      fp.close()
      return sts
  
! def printsumfp(fp, file, out = sys.stdout):
      m = md5.new()
      try:
--- 41,57 ----
      return sts
  
! def printsum(filename, out = sys.stdout):
      try:
!         fp = open(filename, rmode)
      except IOError, msg:
!         sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))
          return 1
      if fnfilter:
!         filename = fnfilter(filename)
!     sts = printsumfp(fp, filename, out)
      fp.close()
      return sts
  
! def printsumfp(fp, filename, out = sys.stdout):
      m = md5.new()
      try:
***************
*** 62,79 ****
              m.update(data)
      except IOError, msg:
!         sys.stderr.write('%s: I/O error: %s\n' % (file, msg))
          return 1
!     out.write('%s %s\n' % (hexify(m.digest()), file))
      return 0
  
- def hexify(s):
-     res = ''
-     for c in s:
-         res = res + '%02x' % ord(c)
-     return res
- 
  def main(args = sys.argv[1:], out = sys.stdout):
      global fnfilter, rmode, bufsize
-     import getopt
      try:
          opts, args = getopt.getopt(args, 'blts:')
--- 61,71 ----
              m.update(data)
      except IOError, msg:
!         sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))
          return 1
!     out.write('%s %s\n' % (m.hexdigest(), filename))
      return 0
  
  def main(args = sys.argv[1:], out = sys.stdout):
      global fnfilter, rmode, bufsize
      try:
          opts, args = getopt.getopt(args, 'blts:')
***************
*** 90,94 ****
          if o == '-s':
              bufsize = int(a)
!     if not args: args = ['-']
      return sum(args, out)
  
--- 82,87 ----
          if o == '-s':
              bufsize = int(a)
!     if not args:
!         args = ['-']
      return sum(args, out)