[Python-checkins] CVS: python/dist/src/Lib os.py,1.46,1.47

[Martin v. L?wis]

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

Modified Files:
	os.py 
Log Message:
Unify _Environ processing on riscos with other platforms.


Index: os.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** os.py	2001/03/06 15:26:07	1.46
--- os.py	2001/03/07 09:05:44	1.47
***************
*** 161,165 ****
      path = riscospath
      del riscospath
-     from riscosenviron import environ
  
      import riscos
--- 161,164 ----
***************
*** 347,361 ****
  
  
! if name != "riscos":
!     # Change environ to automatically call putenv() if it exists
!     try:
!         # This will fail if there's no putenv
!         putenv
!     except NameError:
!         pass
!     else:
!         import UserDict
  
!     if name in ('os2', 'nt', 'dos'):  # Where Env Var Names Must Be UPPERCASE
          # But we store them as upper case
          class _Environ(UserDict.UserDict):
--- 346,362 ----
  
  
! # Change environ to automatically call putenv() if it exists
! try:
!     # This will fail if there's no putenv
!     putenv
! except NameError:
!     pass
! else:
!     import UserDict
  
!     if name == "riscos":
!         # On RISC OS, all env access goes through getenv and putenv
!         from riscosenviron import _Environ
!     elif name in ('os2', 'nt', 'dos'):  # Where Env Var Names Must Be UPPERCASE
          # But we store them as upper case
          class _Environ(UserDict.UserDict):