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

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	os.py 
Log Message:
Patch by Fred Gansevles.

This patch solves 2 problems of the os module.
1) Bug ID #50 (case-mismatch wiht "environ.get(..,..)" and "del environ[..]")
2) os.environ.update (dict) doesn't propagate changes to the 'real'
   environment (i.e doesn't call putenv)

This patches also has minor changes specific for 1.6a
The string module isn't used anymore, instead the strings own methods are
used.


Index: os.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/os.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** os.py	2000/02/04 15:39:30	1.30
--- os.py	2000/04/04 19:50:04	1.31
***************
*** 221,226 ****
      else:
          envpath = defpath
!     import string
!     PATH = string.splitfields(envpath, pathsep)
      if not _notfound:
          import tempfile
--- 221,225 ----
      else:
          envpath = defpath
!     PATH = envpath.split(pathsep)
      if not _notfound:
          import tempfile
***************
*** 249,268 ****
      if name in ('os2', 'nt', 'dos'):  # Where Env Var Names Must Be UPPERCASE
          # But we store them as upper case
-         import string
          class _Environ(UserDict.UserDict):
              def __init__(self, environ):
                  UserDict.UserDict.__init__(self)
                  data = self.data
-                 upper = string.upper
                  for k, v in environ.items():
!                     data[upper(k)] = v
              def __setitem__(self, key, item):
                  putenv(key, item)
!                 key = string.upper(key)
!                 self.data[key] = item
              def __getitem__(self, key):
!                 return self.data[string.upper(key)]
              def has_key(self, key):
!                 return self.data.has_key(string.upper(key))
  
      else:  # Where Env Var Names Can Be Mixed Case
--- 248,271 ----
      if name in ('os2', 'nt', 'dos'):  # Where Env Var Names Must Be UPPERCASE
          # But we store them as upper case
          class _Environ(UserDict.UserDict):
              def __init__(self, environ):
                  UserDict.UserDict.__init__(self)
                  data = self.data
                  for k, v in environ.items():
!                     data[k.upper()] = v
              def __setitem__(self, key, item):
                  putenv(key, item)
!                 self.data[key.upper()] = item
              def __getitem__(self, key):
!                 return self.data[key.upper()]
!             def __delitem__(self, key):
!                 del self.data[key.upper()]
              def has_key(self, key):
!                 return self.data.has_key(key.upper())
!             def get(self, key, failobj=None):
!                 return self.data.get(key.upper(), failobj)
!             def update(self, dict):
!                 for k, v in dict.items():
!                     self[k] = v
  
      else:  # Where Env Var Names Can Be Mixed Case
***************
*** 274,277 ****
--- 277,283 ----
                  putenv(key, item)
                  self.data[key] = item
+             def update(self, dict):
+                 for k, v in dict.items():
+                     self[k] = v
  
      environ = _Environ(environ)