[pywin32-checkins] pywin32/win32/scripts/VersionStamp bulkstamp.py, 1.6.4.2, 1.6.4.3

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4381/win32/scripts/VersionStamp

Modified Files:
      Tag: py3k
	bulkstamp.py 
Log Message:
merge more various changes from the trunk

Index: bulkstamp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/scripts/VersionStamp/bulkstamp.py,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -C2 -d -r1.6.4.2 -r1.6.4.3
*** bulkstamp.py	27 Nov 2008 11:31:10 -0000	1.6.4.2
--- bulkstamp.py	4 Dec 2008 07:28:46 -0000	1.6.4.3
***************
*** 35,39 ****
  import verstamp
  import fnmatch
- import string
  import win32api
  
--- 35,38 ----
***************
*** 80,87 ****
  
    for i in range(len(lines)):
!     line = string.strip(lines[i])
      if line != '' and line[0] != '#':
!       idx1 = string.find(line, ' ')
!       idx2 = string.find(line, '\t')
        if idx1 == -1 or idx2 < idx1:
          idx1 = idx2
--- 79,86 ----
  
    for i in range(len(lines)):
!     line = lines[i].strip()
      if line != '' and line[0] != '#':
!       idx1 = line.find(' ')
!       idx2 = line.find('\t')
        if idx1 == -1 or idx2 < idx1:
          idx1 = idx2
***************
*** 91,95 ****
  
        key = line[:idx1]
!       val = string.strip(line[idx1:])
        if key in vars:
          retvars[key] = val
--- 90,94 ----
  
        key = line[:idx1]
!       val = line[idx1:].strip()
        if key in vars:
          retvars[key] = val
***************
*** 113,117 ****
    numStamped = 0
    try:
!     build = string.atoi(build)
    except ValueError:
      print('ERROR: build number is not a number: %s' % build)
--- 112,116 ----
    numStamped = 0
    try:
!     build = int(build)
    except ValueError:
      print('ERROR: build number is not a number: %s' % build)