Skip to content

Commit 87fc1c9

Browse files
committed
Sort the output of iter_submodules, and exclude __pycache__ directories.
1 parent 31d0bca commit 87fc1c9

11 files changed

+18
-24
lines changed

domdf_python_tools/import_tools.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,5 +254,7 @@ def iter_submodules(module: str) -> Iterator[str]:
254254
continue
255255
elif item.suffix == ".py":
256256
yield f"{module}.{item.stem}"
257+
elif item.name == "__pycache__":
258+
continue
257259
elif item.is_dir():
258-
yield from iter_submodules(f"{module}.{item.name}")
260+
yield from sorted(iter_submodules(f"{module}.{item.name}"))

tests/test_import_tools_/test_iter_submodules_asyncio_3_6_.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
- asyncio.transports
1616
- asyncio.selector_events
1717
- asyncio.constants
18-
- asyncio.__pycache__
1918
- asyncio.futures
2019
- asyncio.sslproto
2120
- asyncio.base_events
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
- collections
22
- collections.abc
3-
- collections.__pycache__

tests/test_import_tools_/test_iter_submodules_consolekit_3_6_.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
- consolekit.utils
88
- consolekit._types
99
- consolekit.commands
10-
- consolekit.__pycache__

tests/test_import_tools_/test_iter_submodules_domdf_python_tools_3_10_.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
- domdf_python_tools.secrets
55
- domdf_python_tools.dates
66
- domdf_python_tools.pagesizes
7-
- domdf_python_tools.pagesizes.sizes
8-
- domdf_python_tools.pagesizes.utils
97
- domdf_python_tools.pagesizes.classes
8+
- domdf_python_tools.pagesizes.sizes
109
- domdf_python_tools.pagesizes.units
10+
- domdf_python_tools.pagesizes.utils
1111
- domdf_python_tools.delegators
1212
- domdf_python_tools.import_tools
1313
- domdf_python_tools.versions
@@ -16,9 +16,9 @@
1616
- domdf_python_tools.testing
1717
- domdf_python_tools.testing.fixtures
1818
- domdf_python_tools.testing.params
19+
- domdf_python_tools.testing.regressions
1920
- domdf_python_tools.testing.selectors
2021
- domdf_python_tools.testing.utils
21-
- domdf_python_tools.testing.regressions
2222
- domdf_python_tools.terminal
2323
- domdf_python_tools.typing
2424
- domdf_python_tools.words

tests/test_import_tools_/test_iter_submodules_domdf_python_tools_3_6_.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
- domdf_python_tools.secrets
55
- domdf_python_tools.dates
66
- domdf_python_tools.pagesizes
7-
- domdf_python_tools.pagesizes.sizes
8-
- domdf_python_tools.pagesizes.utils
97
- domdf_python_tools.pagesizes.classes
10-
- domdf_python_tools.pagesizes.__pycache__
8+
- domdf_python_tools.pagesizes.sizes
119
- domdf_python_tools.pagesizes.units
10+
- domdf_python_tools.pagesizes.utils
1211
- domdf_python_tools.delegators
1312
- domdf_python_tools.import_tools
1413
- domdf_python_tools.versions
@@ -17,11 +16,9 @@
1716
- domdf_python_tools.testing
1817
- domdf_python_tools.testing.fixtures
1918
- domdf_python_tools.testing.params
19+
- domdf_python_tools.testing.regressions
2020
- domdf_python_tools.testing.selectors
2121
- domdf_python_tools.testing.utils
22-
- domdf_python_tools.testing.regressions
23-
- domdf_python_tools.testing.__pycache__
24-
- domdf_python_tools.__pycache__
2522
- domdf_python_tools.terminal
2623
- domdf_python_tools.typing
2724
- domdf_python_tools.words

tests/test_import_tools_/test_iter_submodules_domdf_python_tools_3_7_.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
- domdf_python_tools.secrets
55
- domdf_python_tools.dates
66
- domdf_python_tools.pagesizes
7-
- domdf_python_tools.pagesizes.sizes
8-
- domdf_python_tools.pagesizes.utils
97
- domdf_python_tools.pagesizes.classes
8+
- domdf_python_tools.pagesizes.sizes
109
- domdf_python_tools.pagesizes.units
10+
- domdf_python_tools.pagesizes.utils
1111
- domdf_python_tools.delegators
1212
- domdf_python_tools.import_tools
1313
- domdf_python_tools.versions
@@ -16,9 +16,9 @@
1616
- domdf_python_tools.testing
1717
- domdf_python_tools.testing.fixtures
1818
- domdf_python_tools.testing.params
19+
- domdf_python_tools.testing.regressions
1920
- domdf_python_tools.testing.selectors
2021
- domdf_python_tools.testing.utils
21-
- domdf_python_tools.testing.regressions
2222
- domdf_python_tools.terminal
2323
- domdf_python_tools.typing
2424
- domdf_python_tools.words

tests/test_import_tools_/test_iter_submodules_domdf_python_tools_3_8_.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
- domdf_python_tools.secrets
55
- domdf_python_tools.dates
66
- domdf_python_tools.pagesizes
7-
- domdf_python_tools.pagesizes.sizes
8-
- domdf_python_tools.pagesizes.utils
97
- domdf_python_tools.pagesizes.classes
8+
- domdf_python_tools.pagesizes.sizes
109
- domdf_python_tools.pagesizes.units
10+
- domdf_python_tools.pagesizes.utils
1111
- domdf_python_tools.delegators
1212
- domdf_python_tools.import_tools
1313
- domdf_python_tools.versions
@@ -16,9 +16,9 @@
1616
- domdf_python_tools.testing
1717
- domdf_python_tools.testing.fixtures
1818
- domdf_python_tools.testing.params
19+
- domdf_python_tools.testing.regressions
1920
- domdf_python_tools.testing.selectors
2021
- domdf_python_tools.testing.utils
21-
- domdf_python_tools.testing.regressions
2222
- domdf_python_tools.terminal
2323
- domdf_python_tools.typing
2424
- domdf_python_tools.words

tests/test_import_tools_/test_iter_submodules_domdf_python_tools_3_9_.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
- domdf_python_tools.secrets
55
- domdf_python_tools.dates
66
- domdf_python_tools.pagesizes
7-
- domdf_python_tools.pagesizes.sizes
8-
- domdf_python_tools.pagesizes.utils
97
- domdf_python_tools.pagesizes.classes
8+
- domdf_python_tools.pagesizes.sizes
109
- domdf_python_tools.pagesizes.units
10+
- domdf_python_tools.pagesizes.utils
1111
- domdf_python_tools.delegators
1212
- domdf_python_tools.import_tools
1313
- domdf_python_tools.versions
@@ -16,9 +16,9 @@
1616
- domdf_python_tools.testing
1717
- domdf_python_tools.testing.fixtures
1818
- domdf_python_tools.testing.params
19+
- domdf_python_tools.testing.regressions
1920
- domdf_python_tools.testing.selectors
2021
- domdf_python_tools.testing.utils
21-
- domdf_python_tools.testing.regressions
2222
- domdf_python_tools.terminal
2323
- domdf_python_tools.typing
2424
- domdf_python_tools.words

tests/test_import_tools_/test_iter_submodules_importlib_3_6_.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
- importlib
22
- importlib.abc
3-
- importlib.__pycache__
43
- importlib.util
54
- importlib.machinery
65
- importlib._bootstrap

0 commit comments

Comments
 (0)