1From 0a02e3b85176a5ce4dd98830bb65dac8596142e9 Mon Sep 17 00:00:00 2001 2From: Richard Purdie <richard.purdie@linuxfoundation.org> 3Date: Fri, 27 May 2022 17:05:44 +0100 4Subject: [PATCH] python3: Ensure stale empty python module directories don't 5 6There are two issues here. Firstly, the modules are accessed in on disk order. This 7means behaviour seen on one system might not reproduce on another and is a real headache. 8 9Secondly, empty directories left behind by previous modules might be looked at. This 10has caused a long string of different issues for us. 11 12As a result, patch this to a behaviour which works for us. 13 14Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes] 15Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 16--- 17 Lib/importlib/metadata/__init__.py | 9 ++++++++- 18 1 file changed, 8 insertions(+), 1 deletion(-) 19 20diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py 21index 8ce62dd..a6ea6e9 100644 22--- a/Lib/importlib/metadata/__init__.py 23+++ b/Lib/importlib/metadata/__init__.py 24@@ -786,7 +786,14 @@ class Lookup: 25 self.infos = FreezableDefaultDict(list) 26 self.eggs = FreezableDefaultDict(list) 27 28- for child in path.children(): 29+ for child in sorted(path.children()): 30+ childpath = pathlib.Path(path.root, child) 31+ try: 32+ if childpath.is_dir() and not any(childpath.iterdir()): 33+ # Empty directories aren't interesting 34+ continue 35+ except PermissionError: 36+ continue 37 low = child.lower() 38 if low.endswith((".dist-info", ".egg-info")): 39 # rpartition is faster than splitext and suitable for this purpose. 40