[Jython-checkins] SF.net SVN: jython:[6382] trunk/jython/Lib/os.py

[<pj...@us...>]

Revision: 6382
          http://jython.svn.sourceforge.net/jython/?rev=6382&view=rev
Author:   pjenvey
Date:     2009-05-26 07:00:22 +0000 (Tue, 26 May 2009)

Log Message:
-----------
upgrade Windows environ.os.update from CPython 2.5's os.py

Modified Paths:
--------------
    trunk/jython/Lib/os.py

Modified: trunk/jython/Lib/os.py
===================================================================
--- trunk/jython/Lib/os.py	2009-05-26 06:50:56 UTC (rev 6381)
+++ trunk/jython/Lib/os.py	2009-05-26 07:00:22 UTC (rev 6382)
@@ -904,9 +904,22 @@
             return key.upper() in self.data
         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
+        def update(self, dict=None, **kwargs):
+            if dict:
+                try:
+                    keys = dict.keys()
+                except AttributeError:
+                    # List of (key, value)
+                    for k, v in dict:
+                        self[k] = v
+                else:
+                    # got keys
+                    # cannot use items(), since mappings
+                    # may not have them.
+                    for k in keys:
+                        self[k] = dict[k]
+            if kwargs:
+                self.update(kwargs)
         def copy(self):
             return dict(self)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.