[Python-checkins] python/dist/src/Lib os.py,1.64,1.65

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
Wed, 08 Jan 2003 13:21:03 -0800


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

Modified Files:
	os.py 
Log Message:
SF patch 661583: Remove old code from lib\os.py
A patch from Andrew Wilkinson to change some bizarre old exec statements
specific to NT and CE.


Index: os.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** os.py	8 Jan 2003 16:33:40 -0000	1.64
--- os.py	8 Jan 2003 21:20:57 -0000	1.65
***************
*** 62,70 ****
      defpath = '.;C:\\bin'
      from nt import *
!     for i in ['_exit']:
!         try:
!             exec "from nt import " + i
!         except ImportError:
!             pass
      import ntpath
      path = ntpath
--- 62,69 ----
      defpath = '.;C:\\bin'
      from nt import *
!     try:
!         from nt import _exit
!     except ImportError:
!         pass
      import ntpath
      path = ntpath
***************
*** 128,136 ****
      defpath = '\\Windows'
      from ce import *
!     for i in ['_exit']:
!         try:
!             exec "from ce import " + i
!         except ImportError:
!             pass
      # We can use the standard Windows path.
      import ntpath
--- 127,134 ----
      defpath = '\\Windows'
      from ce import *
!     try:
!         from ce import _exit
!     except ImportError:
!         pass
      # We can use the standard Windows path.
      import ntpath