Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r62955:40c31c512b2a
Date: 2013-04-03 10:05 +0200
http://bitbucket.org/pypy/pypy/changeset/40c31c512b2a/
Log: merge
diff --git a/lib-python/2/site.py b/lib-python/2/site.py
--- a/lib-python/2/site.py
+++ b/lib-python/2/site.py
@@ -554,6 +554,8 @@
def import_builtin_stuff():
"""PyPy specific: pre-import a few built-in modules, because
some programs actually rely on them to be in sys.modules :-("""
+ # encodings is imported sometimes but not always by app_main
+ import encodings
import exceptions
if 'zipimport' in sys.builtin_module_names:
import zipimport
diff --git a/pypy/module/test_lib_pypy/test_site_extra.py
b/pypy/module/test_lib_pypy/test_site_extra.py
--- a/pypy/module/test_lib_pypy/test_site_extra.py
+++ b/pypy/module/test_lib_pypy/test_site_extra.py
@@ -2,7 +2,7 @@
def test_preimported_modules():
- lst = ['__builtin__', '_warnings',
+ lst = ['__builtin__', '_codecs', '_warnings', 'codecs', 'encodings',
'exceptions', 'signal', 'sys', 'zipimport']
g = os.popen("'%s' -c 'import sys; print sorted(sys.modules)'" %
(sys.executable,))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
