Index: Lib/os.py
===================================================================
--- Lib/os.py	(revision 41544)
+++ Lib/os.py	(working copy)
@@ -401,8 +401,6 @@
 except NameError:
 pass
 else:
- import UserDict
-
 # Fake unsetenv() for Windows
 # not sure about os2 here but
 # I'm guessing they are the same.
@@ -416,73 +414,81 @@
 from riscosenviron import _Environ
 elif name in ('os2', 'nt'): # Where Env Var Names Must Be UPPERCASE
 # But we store them as upper case
- class _Environ(UserDict.IterableUserDict):
+ class _Environ(dict):
+
 def __init__(self, environ):
- UserDict.UserDict.__init__(self)
- data = self.data
- for k, v in environ.items():
- data[k.upper()] = v
+ dict.__init__(self, 
+ [(k.upper(), v) for k, v in environ.items()])
+
 def __setitem__(self, key, item):
 putenv(key, item)
- self.data[key.upper()] = item
+ dict.__setitem__(self, key.upper(), item)
+
 def __getitem__(self, key):
- return self.data[key.upper()]
+ return dict.__getitem__(self, key.upper())
 try:
 unsetenv
 except NameError:
 def __delitem__(self, key):
- del self.data[key.upper()]
+ dict.__delitem__(self, key)
 else:
 def __delitem__(self, key):
 unsetenv(key)
- del self.data[key.upper()]
+ dict.__delitem__(self, key.upper())
+
 def has_key(self, key):
- return key.upper() in self.data
+ return dict.has_key(self, key.upper())
+
 def __contains__(self, key):
- return key.upper() in self.data
+ return dict.__contains__(self, key.upper())
+
 def get(self, key, failobj=None):
- return self.data.get(key.upper(), failobj)
- def update(self, dict=None, **kwargs):
- if dict:
+ return dict.get(self, key.upper(), failobj)
+
+ def update(self, dict_=None, **kwargs):
+ if dict_:
 try:
- keys = dict.keys()
+ keys = dict_.keys()
 except AttributeError:
 # List of (key, value)
- for k, v in dict:
+ 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]
+ self[k] = dict_[k]
 if kwargs:
 self.update(kwargs)
+
 def copy(self):
 return dict(self)
 
 else: # Where Env Var Names Can Be Mixed Case
- class _Environ(UserDict.IterableUserDict):
+ class _Environ(dict):
+
 def __init__(self, environ):
- UserDict.UserDict.__init__(self)
- self.data = environ
+ dict.__init__(self, environ)
+
 def __setitem__(self, key, item):
 putenv(key, item)
- self.data[key] = item
- def update(self, dict=None, **kwargs):
- if dict:
+ dict.__setitem__(self, key, item)
+
+ def update(self, dict_=None, **kwargs):
+ if dict_:
 try:
- keys = dict.keys()
+ keys = dict_.keys()
 except AttributeError:
 # List of (key, value)
- for k, v in dict:
+ 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]
+ self[k] = dict_[k]
 if kwargs:
 self.update(kwargs)
 try:
@@ -493,6 +499,7 @@
 def __delitem__(self, key):
 unsetenv(key)
 del self.data[key]
+
 def copy(self):
 return dict(self)
 
@@ -689,8 +696,8 @@
 
 import copy_reg as _copy_reg
 
-def _make_stat_result(tup, dict):
- return stat_result(tup, dict)
+def _make_stat_result(tup, dict_):
+ return stat_result(tup, dict_)
 
 def _pickle_stat_result(sr):
 (type, args) = sr.__reduce__()
@@ -701,8 +708,8 @@
 except NameError: # stat_result may not exist
 pass
 
-def _make_statvfs_result(tup, dict):
- return statvfs_result(tup, dict)
+def _make_statvfs_result(tup, dict_):
+ return statvfs_result(tup, dict_)
 
 def _pickle_statvfs_result(sr):
 (type, args) = sr.__reduce__()
@@ -730,3 +737,4 @@
 bytes += read(_urandomfd, n - len(bytes))
 close(_urandomfd)
 return bytes
+
 	 	 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file6896/os.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file6896/os.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>