Merge branch 'raulgrell-develop' into develop

pypa · Jun 22, 2012 · 7c619a3 · 7c619a3
2 parents f4e7f29 + 0e6e1aa
commit 7c619a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -40,9 +40,11 @@ Josh Bronson
 Konstantin Zemlyak
 Kumar McMillan
 Lars Francke
+Marc Abramowitz
 Mike Hommey
 Miki Tebeka
 Philip Jenvey
+Raul Leal
 Ronny Pfannschmidt
 Stefano Rivera
 Tarek Ziadé

diff --git a/docs/news.txt b/docs/news.txt
@@ -36,6 +36,10 @@ develop (unreleased)
 
 * Fixed PyPy and Jython support on Windows. Thanks Konstantin Zemlyak.
 
+* Added pydoc script to ease use. Thanks Marc Abramowitz. Fixes #149.
+
+* Fixed creating a bootstrap script on Python 3. Thanks Raul Leal. Fixes #280.
+
 1.7.1.2 (2012-02-17)
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/virtualenv.py b/virtualenv.py
@@ -9,6 +9,7 @@
 import base64
 import sys
 import os
+import codecs
 import optparse
 import re
 import shutil
@@ -1769,7 +1770,7 @@ def after_install(options, home_dir):
     filename = __file__
     if filename.endswith('.pyc'):
         filename = filename[:-1]
-    f = open(filename, 'rb')
+    f = codecs.open(filename, 'r', encoding='utf-8')
     content = f.read()
     f.close()
     py_exe = 'python%s' % python_version