[Python-checkins] python/dist/src/Tools/versioncheck checkversions.py,1.2,1.3 pyversioncheck.py,1.3,1.4

doerwalter@users.sourceforge.net doerwalter@users.sourceforge.net
Wed, 11 Sep 2002 13:36:04 -0700


Update of /cvsroot/python/python/dist/src/Tools/versioncheck
In directory usw-pr-cvs1:/tmp/cvs-serv827/versioncheck

Modified Files:
	checkversions.py pyversioncheck.py 
Log Message:
Apply diff2.txt from SF patch http://www.python.org/sf/572113
(with one small bugfix in bgen/bgen/scantools.py)

This replaces string module functions with string methods
for the stuff in the Tools directory. Several uses of
string.letters etc. are still remaining.


Index: checkversions.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/versioncheck/checkversions.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** checkversions.py	31 Dec 1997 15:46:56 -0000	1.2
--- checkversions.py	11 Sep 2002 20:36:01 -0000	1.3
***************
*** 6,10 ****
  import getopt
  import sys
- import string
  import pyversioncheck
  
--- 6,9 ----
***************
*** 44,48 ****
  	for o, a in options:
  		if o == '-v':
! 			VERBOSE = string.atoi(a)
  	if not arguments:
  		arguments = [sys.prefix]
--- 43,47 ----
  	for o, a in options:
  		if o == '-v':
! 			VERBOSE = int(a)
  	if not arguments:
  		arguments = [sys.prefix]

Index: pyversioncheck.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/versioncheck/pyversioncheck.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pyversioncheck.py	6 Apr 1998 14:20:27 -0000	1.3
--- pyversioncheck.py	11 Sep 2002 20:36:01 -0000	1.4
***************
*** 4,8 ****
  import urllib
  import sys
- import string
  
  # Verbose options
--- 4,7 ----
***************
*** 61,66 ****
              print '    No "Current-Version:" header in URL or URL not found'
          return -1, None, None
!     version = string.strip(string.lower(version))
!     newversion = string.strip(string.lower(newversion))
      if version == newversion:
          if verbose >= VERBOSE_EACHFILE:
--- 60,65 ----
              print '    No "Current-Version:" header in URL or URL not found'
          return -1, None, None
!     version = version.lower().strip()
!     newversion = newversion.lower().strip()
      if version == newversion:
          if verbose >= VERBOSE_EACHFILE: