Index: Lib/wsgiref/simple_server.py
===================================================================
--- Lib/wsgiref/simple_server.py	(revision 64895)
+++ Lib/wsgiref/simple_server.py	(working copy)
@@ -111,8 +111,7 @@
 if length:
 env['CONTENT_LENGTH'] = length
 
- for h in self.headers:
- k,v = h.split(':',1)
+ for k,v in self.headers.items():
 k=k.replace('-','_').upper(); v=v.strip()
 if k in env:
 continue # skip content length, type,etc.
@@ -168,7 +167,7 @@
 stdout = StringIO()
 print("Hello world!", file=stdout)
 print(file=stdout)
- h = environ.items(); h.sort()
+ h = environ.items(); h = sorted(h)
 for k,v in h:
 print(k,'=',repr(v), file=stdout)
 start_response("200 OK", [('Content-Type','text/plain')])
</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/file10886/simple_server.py.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file10886/simple_server.py.patch" 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>