[Python-checkins] CVS: python/dist/src/Lib/distutils version.py,1.3,1.4

Eric S. Raymond esr@users.sourceforge.net
Fri, 09 Feb 2001 04:19:56 -0800


Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv22333

Modified Files:
	version.py 
Log Message:
String method conversion.


Index: version.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/version.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** version.py	2000/09/26 01:53:34	1.3
--- version.py	2001/02/09 12:19:54	1.4
***************
*** 113,122 ****
  
          if patch:
!             self.version = tuple(map(string.atoi, [major, minor, patch]))
          else:
!             self.version = tuple(map(string.atoi, [major, minor]) + [0])
  
          if prerelease:
!             self.prerelease = (prerelease[0], string.atoi(prerelease_num))
          else:
              self.prerelease = None
--- 113,122 ----
  
          if patch:
!             self.version = tuple(map(int, [major, minor, patch]))
          else:
!             self.version = tuple(map(int, [major, minor]) + [0])
  
          if prerelease:
!             self.prerelease = (prerelease[0], int(prerelease_num))
          else:
              self.prerelease = None
***************
*** 126,132 ****
          
          if self.version[2] == 0:
!             vstring = string.join(map(str, self.version[0:2]), '.')
          else:
!             vstring = string.join(map(str, self.version), '.')
  
          if self.prerelease:
--- 126,132 ----
          
          if self.version[2] == 0:
!             vstring = '.'.join(map(str, self.version[0:2]))
          else:
!             vstring = '.'.join(map(str, self.version))
  
          if self.prerelease: