From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 3 Aug 2010 17:09:36 +0000 (+0000)
Subject: Issue #8867: Fix `Tools/scripts/serve.py` to work with files containing
X-Git-Tag: v3.2a2~490
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f767f08e290d0caa42148083940a08e8425b18f2;p=thirdparty%2FPython%2Fcpython.git

Issue #8867: Fix `Tools/scripts/serve.py` to work with files containing
non-ASCII content.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 91cdb60872c0..a1f07f7a46ca 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,12 @@ Library
 
 - Add lfu_cache() and lru_cache() decorators to the functools module.
 
+Tools/Demos
+-----------
+
+- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing
+  non-ASCII content.
+
 
 What's New in Python 3.2 Alpha 1?
 =================================
diff --git a/Tools/scripts/serve.py b/Tools/scripts/serve.py
index c3b7bdbaaf71..89b3d6218fb8 100755
--- a/Tools/scripts/serve.py
+++ b/Tools/scripts/serve.py
@@ -19,7 +19,7 @@ def app(environ, respond):
 
     if os.path.exists(fn):
         respond('200 OK', [('Content-Type', type)])
-        return util.FileWrapper(open(fn))
+        return util.FileWrapper(open(fn, "rb"))
     else:
         respond('404 Not Found', [('Content-Type', 'text/plain')])
         return ['not found']