Revert "Revert "Fixed #1785: module incorrectly excluded from stdlib …

…definition."" This reverts commit 8ae8d50.
PyCQA · Jul 30, 2021 · acf43fc · acf43fc
1 parent a433308
commit acf43fc
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Changelog
 NOTE: isort follows the [semver](https://semver.org/) versioning standard.
 Find out more about isort's release policy [here](https://pycqa.github.io/isort/docs/major_releases/release_policy).
 
+### 5.10.0 TBD
+
+#### Potentially breaking changes:
+  - Fixed #1785: `_ast` module incorrectly excluded from stdlib definition.
+
 ### 5.9.3 July 28 2021
   - Improved text of skipped file message to mention gitignore feature.
   - Made all exceptions pickleable.

diff --git a/isort/stdlibs/py27.py b/isort/stdlibs/py27.py
@@ -40,6 +40,7 @@
     "UserString",
     "W",
     "__builtin__",
+    "_ast",
     "_winreg",
     "abc",
     "aepack",

diff --git a/isort/stdlibs/py35.py b/isort/stdlibs/py35.py
@@ -6,6 +6,7 @@
 """
 
 stdlib = {
+    "_ast",
     "_dummy_thread",
     "_thread",
     "abc",

diff --git a/isort/stdlibs/py36.py b/isort/stdlibs/py36.py
@@ -6,6 +6,7 @@
 """
 
 stdlib = {
+    "_ast",
     "_dummy_thread",
     "_thread",
     "abc",

diff --git a/isort/stdlibs/py37.py b/isort/stdlibs/py37.py
@@ -6,6 +6,7 @@
 """
 
 stdlib = {
+    "_ast",
     "_dummy_thread",
     "_thread",
     "abc",

diff --git a/isort/stdlibs/py38.py b/isort/stdlibs/py38.py
@@ -6,6 +6,7 @@
 """
 
 stdlib = {
+    "_ast",
     "_dummy_thread",
     "_thread",
     "abc",

diff --git a/isort/stdlibs/py39.py b/isort/stdlibs/py39.py
@@ -6,6 +6,7 @@
 """
 
 stdlib = {
+    "_ast",
     "_thread",
     "abc",
     "aifc",

diff --git a/scripts/mkstdlibs.py b/scripts/mkstdlibs.py
@@ -31,7 +31,7 @@ class FakeApp:
     invdata = fetch_inventory(FakeApp(), "", url)
 
     # Any modules we want to enforce across Python versions stdlib can be included in set init
-    modules = {"posixpath", "ntpath", "sre_constants", "sre_parse", "sre_compile", "sre"}
+    modules = {"_ast", "posixpath", "ntpath", "sre_constants", "sre_parse", "sre_compile", "sre"}
     for module in invdata["py:module"]:
         root, *_ = module.split(".")
         if root not in ["__future__", "__main__"]:

diff --git a/tests/integration/test_projects_using_isort.py b/tests/integration/test_projects_using_isort.py
@@ -83,7 +83,7 @@ def test_websockets(tmpdir):
 
 def test_airflow(tmpdir):
     git_clone("https://github.com/apache/airflow.git", tmpdir)
-    run_isort([str(tmpdir), "--skip-glob", "*/_vendor/*"])
+    run_isort([str(tmpdir), "--skip-glob", "*/_vendor/*", "--skip", "tests"])
 
 
 def test_typeshed(tmpdir):
@@ -97,6 +97,8 @@ def test_typeshed(tmpdir):
             "scripts",
             "--skip",
             f"{tmpdir}/third_party/2and3/yaml/__init__.pyi",
+            "--skip",
+            f"{tmpdir}/stdlib/ast.pyi",
         )
     )