[Python-checkins] CVS: distutils/distutils version.py,1.2,1.3

[Greg Ward]

Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15995

Modified Files:
	version.py 
Log Message:
Standardize whitespace in function calls.

Index: version.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/version.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** version.py	2000/06/28 14:48:01	1.2
--- version.py	2000/09/26 01:53:34	1.3
***************
*** 40,47 ****
      def __init__ (self, vstring=None):
          if vstring:
!             self.parse (vstring)
  
      def __repr__ (self):
!         return "%s ('%s')" % (self.__class__.__name__, str (self))
  
  
--- 40,47 ----
      def __init__ (self, vstring=None):
          if vstring:
!             self.parse(vstring)
  
      def __repr__ (self):
!         return "%s ('%s')" % (self.__class__.__name__, str(self))
  
  
***************
*** 100,122 ****
      """
      
!     version_re = re.compile (r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
!                              re.VERBOSE)
  
  
      def parse (self, vstring):
!         match = self.version_re.match (vstring)
          if not match:
              raise ValueError, "invalid version number '%s'" % vstring
  
          (major, minor, patch, prerelease, prerelease_num) = \
!             match.group (1, 2, 4, 5, 6)
  
          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
--- 100,122 ----
      """
      
!     version_re = re.compile(r'^(\d+) \. (\d+) (\. (\d+))? ([ab](\d+))?$',
!                             re.VERBOSE)
  
  
      def parse (self, vstring):
!         match = self.version_re.match(vstring)
          if not match:
              raise ValueError, "invalid version number '%s'" % vstring
  
          (major, minor, patch, prerelease, prerelease_num) = \
!             match.group(1, 2, 4, 5, 6)
  
          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
***************
*** 126,135 ****
          
          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:
!             vstring = vstring + self.prerelease[0] + str (self.prerelease[1])
  
          return vstring
--- 126,135 ----
          
          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:
!             vstring = vstring + self.prerelease[0] + str(self.prerelease[1])
  
          return vstring
***************
*** 137,144 ****
  
      def __cmp__ (self, other):
!         if isinstance (other, StringType):
!             other = StrictVersion (other)
  
!         compare = cmp (self.version, other.version)
          if (compare == 0):              # have to compare prerelease
  
--- 137,144 ----
  
      def __cmp__ (self, other):
!         if isinstance(other, StringType):
!             other = StrictVersion(other)
  
!         compare = cmp(self.version, other.version)
          if (compare == 0):              # have to compare prerelease
  
***************
*** 155,159 ****
                  return 1
              elif (self.prerelease and other.prerelease):
!                 return cmp (self.prerelease, other.prerelease)
  
          else:                           # numeric versions don't match --
--- 155,159 ----
                  return 1
              elif (self.prerelease and other.prerelease):
!                 return cmp(self.prerelease, other.prerelease)
  
          else:                           # numeric versions don't match --
***************
*** 265,269 ****
      def __init__ (self, vstring=None):
          if vstring:
!             self.parse (vstring)
  
  
--- 265,269 ----
      def __init__ (self, vstring=None):
          if vstring:
!             self.parse(vstring)
  
  
***************
*** 273,281 ****
          # use by __str__
          self.vstring = vstring
!         components = filter (lambda x: x and x != '.',
!                              self.component_re.split (vstring))
!         for i in range (len (components)):
              try:
!                 components[i] = int (components[i])
              except ValueError:
                  pass
--- 273,281 ----
          # use by __str__
          self.vstring = vstring
!         components = filter(lambda x: x and x != '.',
!                             self.component_re.split(vstring))
!         for i in range(len(components)):
              try:
!                 components[i] = int(components[i])
              except ValueError:
                  pass
***************
*** 289,300 ****
  
      def __repr__ (self):
!         return "LooseVersion ('%s')" % str (self)
  
  
      def __cmp__ (self, other):
!         if isinstance (other, StringType):
!             other = LooseVersion (other)
  
!         return cmp (self.version, other.version)
          
  
--- 289,300 ----
  
      def __repr__ (self):
!         return "LooseVersion ('%s')" % str(self)
  
  
      def __cmp__ (self, other):
!         if isinstance(other, StringType):
!             other = LooseVersion(other)
  
!         return cmp(self.version, other.version)