[Python-checkins] python/dist/src/Lib posixpath.py,1.58,1.59

[doerwalter@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv32632/Lib

Modified Files:
	posixpath.py 
Log Message:
Modernize Lib/posixpath.py: Use startswith(), endswith(), rstrip(),
struct_passwd attributes and +=.

>From SF patch #755245.


Index: posixpath.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** posixpath.py	14 Feb 2003 19:35:30 -0000	1.58
--- posixpath.py	17 Jun 2003 13:13:40 -0000	1.59
***************
*** 46,50 ****
  def isabs(s):
      """Test whether a path is absolute"""
!     return s[:1] == '/'
  
  
--- 46,50 ----
  def isabs(s):
      """Test whether a path is absolute"""
!     return s.startswith('/')
  
  
***************
*** 57,66 ****
      path = a
      for b in p:
!         if b[:1] == '/':
              path = b
!         elif path == '' or path[-1:] == '/':
!             path = path + b
          else:
!             path = path + '/' + b
      return path
  
--- 57,66 ----
      path = a
      for b in p:
!         if b.startswith('/'):
              path = b
!         elif path == '' or path.endswith('/'):
!             path +=  b
          else:
!             path += '/' + b
      return path
  
***************
*** 77,82 ****
      head, tail = p[:i], p[i:]
      if head and head != '/'*len(head):
!         while head[-1] == '/':
!             head = head[:-1]
      return head, tail
  
--- 77,81 ----
      head, tail = p[:i], p[i:]
      if head and head != '/'*len(head):
!         head = head.rstrip('/')
      return head, tail
  
***************
*** 130,134 ****
              if prefix[:i+1] != item[:i+1]:
                  prefix = prefix[:i]
!                 if i == 0: return ''
                  break
      return prefix
--- 129,134 ----
              if prefix[:i+1] != item[:i+1]:
                  prefix = prefix[:i]
!                 if i == 0:
!                     return ''
                  break
      return prefix
***************
*** 302,314 ****
      """Expand ~ and ~user constructions.  If user or $HOME is unknown,
      do nothing."""
!     if path[:1] != '~':
          return path
      i, n = 1, len(path)
      while i < n and path[i] != '/':
!         i = i + 1
      if i == 1:
          if not 'HOME' in os.environ:
              import pwd
!             userhome = pwd.getpwuid(os.getuid())[5]
          else:
              userhome = os.environ['HOME']
--- 302,314 ----
      """Expand ~ and ~user constructions.  If user or $HOME is unknown,
      do nothing."""
!     if not path.startswith('~'):
          return path
      i, n = 1, len(path)
      while i < n and path[i] != '/':
!         i += 1
      if i == 1:
          if not 'HOME' in os.environ:
              import pwd
!             userhome = pwd.getpwuid(os.getuid()).pw_dir
          else:
              userhome = os.environ['HOME']
***************
*** 319,324 ****
          except KeyError:
              return path
!         userhome = pwent[5]
!     if userhome[-1:] == '/': i = i + 1
      return userhome + path[i:]
  
--- 319,325 ----
          except KeyError:
              return path
!         userhome = pwent.pw_dir
!     if userhome.endswith('/'):
!         i += 1
      return userhome + path[i:]
  
***************
*** 346,350 ****
          i, j = m.span(0)
          name = m.group(1)
!         if name[:1] == '{' and name[-1:] == '}':
              name = name[1:-1]
          if name in os.environ:
--- 347,351 ----
          i, j = m.span(0)
          name = m.group(1)
!         if name.startswith('{') and name.endswith('}'):
              name = name[1:-1]
          if name in os.environ:
***************
*** 352,356 ****
              path = path[:i] + os.environ[name]
              i = len(path)
!             path = path + tail
          else:
              i = j
--- 353,357 ----
              path = path[:i] + os.environ[name]
              i = len(path)
!             path += tail
          else:
              i = j