[Python-checkins] python/dist/src/Lib site.py,1.63,1.64

[bcannon at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10656/Lib

Modified Files:
	site.py 
Log Message:
Fix bug in addsitedir() to properly handle the lack of a second argument.
Fixed to keep backwards-compatibility for the undocumented function.

Closes bug #986795.


Index: site.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/site.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** site.py	9 Jul 2004 23:38:18 -0000	1.63
--- site.py	20 Jul 2004 02:28:28 -0000	1.64
***************
*** 125,129 ****
      fullname = os.path.join(sitedir, name)
      try:
!         f = file(fullname, "rU")
      except IOError:
          return
--- 125,129 ----
      fullname = os.path.join(sitedir, name)
      try:
!         f = open(fullname, "rU")
      except IOError:
          return
***************
*** 150,154 ****
      'sitedir'"""
      if known_paths is None:
!         d = _init_pathinfo()
          reset = 1
      else:
--- 150,154 ----
      'sitedir'"""
      if known_paths is None:
!         known_paths = _init_pathinfo()
          reset = 1
      else:
***************
*** 163,167 ****
      names.sort()
      for name in names:
!         if name[-4:] == os.extsep + "pth":
              addpackage(sitedir, name, known_paths)
      if reset:
--- 163,167 ----
      names.sort()
      for name in names:
!         if name.endswith(os.extsep + "pth"):
              addpackage(sitedir, name, known_paths)
      if reset: