Author: Ronan Lamy <[email protected]>
Branch: py3k
Changeset: r86536:ce4d4b3c159f
Date: 2016-08-25 21:49 +0100
http://bitbucket.org/pypy/pypy/changeset/ce4d4b3c159f/
Log: Revert the main part of 26dfa2f67afd since it breaks too many random
things, e.g. it caused pypy/module/imp/test/test_import.py::AppTestM
ultithreadedImp.test_multithreaded_import to hang.
diff --git a/pypy/module/sys/__init__.py b/pypy/module/sys/__init__.py
--- a/pypy/module/sys/__init__.py
+++ b/pypy/module/sys/__init__.py
@@ -139,12 +139,10 @@
space = self.space
if not space.config.translating:
- ##from pypy.module.sys.interp_encoding import
_getfilesystemencoding
- ##self.filesystemencoding = _getfilesystemencoding(space)
+ from pypy.module.sys.interp_encoding import _getfilesystemencoding
+ self.filesystemencoding = _getfilesystemencoding(space)
# XXX the two lines above take a few seconds to run whenever
- # we initialize the space; for tests, use a simpler version
- from pypy.module.sys.interp_encoding import base_encoding
- self.filesystemencoding = base_encoding
+ # we initialize the space
def flush_std_files(self, space):
w_stdout = space.sys.getdictvalue(space, 'stdout')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
