[pypy-commit] pypy py3.6: merge default into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r98207:5c84cb16971d
Date: 2019-12-01 21:57 +0200
http://bitbucket.org/pypy/pypy/changeset/5c84cb16971d/

Log:	merge default into branch

diff --git a/pypy/module/imp/test/test_app.py b/pypy/module/imp/test/test_app.py
--- a/pypy/module/imp/test/test_app.py
+++ b/pypy/module/imp/test/test_app.py
@@ -7,8 +7,8 @@
 class AppTestImpModule:
     # cpyext is required for _imp.create_dynamic()
     spaceconfig = {
-        'usemodules': [
-            'binascii', 'imp', 'itertools', 'time', 'struct', 'cpyext'],
+        'usemodules': ['binascii', 'imp', 'itertools', 'time', 'struct',
+                       'zipimport', cpyext],
     }
 
     def setup_class(cls):
@@ -316,3 +316,14 @@
         if not hasattr(sys, 'pypy_version_info'):
             skip('This test is PyPy-only')
         assert imp.get_tag() == 'pypy%d%d' % (sys.version_info[:2])
+
+    def test_unicode_in_sys_path(self):
+        # issue 3112: when _getimporter calls
+        # for x in sys.path: for h in sys.path_hooks: h(x)
+        # make sure x is properly encoded
+        import sys
+        import zipimport #  installs a sys.path_hook
+        if sys.getfilesystemencoding().lower() == 'utf-8':
+            sys.path.insert(0, u'\xef')
+        with raises(ImportError):
+            import impossible_module