[Python-checkins] CVS: distutils/distutils util.py,1.47,1.48

[Greg Ward]

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

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

Index: util.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/util.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** util.py	2000/09/25 01:25:06	1.47
--- util.py	2000/09/26 01:54:31	1.48
***************
*** 89,102 ****
      """
      if os.name == 'posix':
!         if not os.path.isabs (pathname):
!             return os.path.join (new_root, pathname)
          else:
!             return os.path.join (new_root, pathname[1:])
  
      elif os.name == 'nt':
!         (drive, path) = os.path.splitdrive (pathname)
          if path[0] == '\\':
              path = path[1:]
!         return os.path.join (new_root, path)
  
      elif os.name == 'mac':
--- 89,102 ----
      """
      if os.name == 'posix':
!         if not os.path.isabs(pathname):
!             return os.path.join(new_root, pathname)
          else:
!             return os.path.join(new_root, pathname[1:])
  
      elif os.name == 'nt':
!         (drive, path) = os.path.splitdrive(pathname)
          if path[0] == '\\':
              path = path[1:]
!         return os.path.join(new_root, path)
  
      elif os.name == 'mac':
***************
*** 130,137 ****
      if os.name == 'posix' and not os.environ.has_key('HOME'):
          import pwd
!         os.environ['HOME'] = pwd.getpwuid (os.getuid())[5]
  
      if not os.environ.has_key('PLAT'):
!         os.environ['PLAT'] = get_platform ()
  
      _environ_checked = 1
--- 130,137 ----
      if os.name == 'posix' and not os.environ.has_key('HOME'):
          import pwd
!         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
  
      if not os.environ.has_key('PLAT'):
!         os.environ['PLAT'] = get_platform()
  
      _environ_checked = 1
***************
*** 148,160 ****
         either 'local_vars' or 'os.environ'."""
  
!     check_environ ()
      def _subst (match, local_vars=local_vars):
          var_name = match.group(1)
!         if local_vars.has_key (var_name):
!             return str (local_vars[var_name])
          else:
              return os.environ[var_name]
  
!     return re.sub (r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
  
  # subst_vars ()
--- 148,160 ----
         either 'local_vars' or 'os.environ'."""
  
!     check_environ()
      def _subst (match, local_vars=local_vars):
          var_name = match.group(1)
!         if local_vars.has_key(var_name):
!             return str(local_vars[var_name])
          else:
              return os.environ[var_name]
  
!     return re.sub(r'\$([a-zA-Z_][a-zA-Z_0-9]*)', _subst, str)
  
  # subst_vars ()
***************
*** 170,174 ****
      """
      # check for Python 1.5.2-style {IO,OS}Error exception objects
!     if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
          if exc.filename:
              error = prefix + "%s: %s" % (exc.filename, exc.strerror)
--- 170,174 ----
      """
      # check for Python 1.5.2-style {IO,OS}Error exception objects
!     if hasattr(exc, 'filename') and hasattr(exc, 'strerror'):
          if exc.filename:
              error = prefix + "%s: %s" % (exc.filename, exc.strerror)