Merge branch 'master' into bugfix/94-bad-path

Author: jaraco

.gitlab-ci.yml

@@ -22,6 +22,10 @@ coverage:
     paths:
       - coverage.xml
 
+benchmark:
+  script:
+    - tox -e perf
+
 diffcov:
   script:
     - tox -e py27-diffcov,py35-diffcov,py36-diffcov,py37-diffcov,py38-diffcov

importlib_metadata/__init__.py

@@ -408,6 +408,7 @@ class FastPath:
 
     def __init__(self, root):
         self.root = root
+        self.base = os.path.basename(root).lower()
 
     def joinpath(self, child):
         return pathlib.Path(self.root, child)
@@ -430,12 +431,11 @@ def zip_children(self):
             )
 
     def is_egg(self, search):
-        root_n_low = os.path.split(self.root)[1].lower()
-
+        base = self.base
         return (
-            root_n_low == search.normalized + '.egg'
-            or root_n_low.startswith(search.prefix)
-            and root_n_low.endswith('.egg'))
+            base == search.versionless_egg_name
+            or base.startswith(search.prefix)
+            and base.endswith('.egg'))
 
     def search(self, name):
         for child in self.children():
@@ -456,6 +456,7 @@ class Prepared:
     prefix = ''
     suffixes = '.dist-info', '.egg-info'
     exact_matches = [''][:0]
+    versionless_egg_name = ''
 
     def __init__(self, name):
         self.name = name
@@ -465,6 +466,7 @@ def __init__(self, name):
         self.prefix = self.normalized + '-'
         self.exact_matches = [
             self.normalized + suffix for suffix in self.suffixes]
+        self.versionless_egg_name = self.normalized + '.egg'
 
 
 @install

importlib_metadata/docs/changelog.rst

@@ -2,13 +2,24 @@
  importlib_metadata NEWS
 =========================
 
+v1.5.0
+======
+
+* Additional performance optimizations in FastPath now
+  saves an additional 20% on a typical call.
+
 v1.4.0
 ======
 
 * Through careful optimization, ``distribution()`` is
   3-4x faster. Thanks to Antony Lee for the
   contribution. Closes #95.
 
+* When searching through ``sys.path``, if any error
+  occurs attempting to list a path entry, that entry
+  is skipped, making the system much more lenient
+  to errors. Closes #94.
+
 v1.3.0
 ======
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,py36,py37,py38}{,-cov,-diffcov},qa,docs
+envlist = {py27,py35,py36,py37,py38}{,-cov,-diffcov},qa,docs,perf
 skip_missing_interpreters = True
 
 
@@ -61,6 +61,14 @@ extras =
     docs
 
 
+[testenv:perf]
+use_develop = False
+deps =
+    ipython
+commands =
+    python -m timeit -s 'import importlib_metadata' -- 'importlib_metadata.distribution("ipython")'
+
+
 [testenv:release]
 basepython = python3
 deps =