Merge branch 'bugfix/121-unicode-error-on-fastpath' into 'master'

Correct Unicode error on FastPath

Closes #121

See merge request python-devs/importlib_metadata!122

Author: jaraco

importlib_metadata/__init__.py

@@ -29,6 +29,7 @@
     email_message_from_string,
     PyPy_repr,
     unique_ordered,
+    str,
     )
 from importlib import import_module
 from itertools import starmap
@@ -418,8 +419,8 @@ class FastPath:
     """
 
     def __init__(self, root):
-        self.root = root
-        self.base = os.path.basename(root).lower()
+        self.root = str(root)
+        self.base = os.path.basename(self.root).lower()
 
     def joinpath(self, child):
         return pathlib.Path(self.root, child)

importlib_metadata/_compat.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import io
 import abc
@@ -26,6 +26,8 @@
     NotADirectoryError = IOError, OSError
     PermissionError = IOError, OSError
 
+str = type('')
+
 suppress = contextlib.suppress
 
 if sys.version_info > (3, 5):  # pragma: nocover

importlib_metadata/docs/changelog.rst

@@ -5,6 +5,7 @@
 v1.6.1
 ======
 
+* Ensure inputs to FastPath are Unicode. Closes #121.
 * Tests now rely on ``importlib.resources.files`` (and
   backport) instead of the older ``path`` function.
 

importlib_metadata/tests/test_integration.py

@@ -1,10 +1,15 @@
+# coding: utf-8
+
+from __future__ import unicode_literals
+
 import unittest
 import packaging.requirements
 import packaging.version
 
 from . import fixtures
 from .. import (
     _compat,
+    distributions,
     version,
     )
 
@@ -40,3 +45,13 @@ def __getattribute__(self, name):
         self.fixtures.enter_context(
             fixtures.install_finder(ModuleFreeFinder()))
         _compat.disable_stdlib_finder()
+
+
+class FileSystem(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
+    def test_unicode_dir_on_sys_path(self):
+        """
+        Ensure a Unicode subdirectory of a directory on sys.path
+        does not crash.
+        """
+        fixtures.build_files({'☃': {}}, prefix=self.site_dir)
+        list(distributions())