https://github.com/python/cpython/commit/427f8c366dcc1d9148b567c8b2cc74891abb3e98
commit: 427f8c366dcc1d9148b567c8b2cc74891abb3e98
branch: main
author: Max Bachmann <[email protected]>
committer: zooba <[email protected]>
date: 2025-05-07T20:45:42+01:00
summary:
gh-133517: Remove os.listdrive, os.listvolumes and os.listmounts in non-desktop
Windows builds (GH-133518)
files:
A Misc/NEWS.d/next/Library/2025-05-06-14-44-55.gh-issue-133517.Ca6NgW.rst
M Modules/clinic/posixmodule.c.h
M Modules/posixmodule.c
diff --git
a/Misc/NEWS.d/next/Library/2025-05-06-14-44-55.gh-issue-133517.Ca6NgW.rst
b/Misc/NEWS.d/next/Library/2025-05-06-14-44-55.gh-issue-133517.Ca6NgW.rst
new file mode 100644
index 00000000000000..7c53fc484a84ac
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-05-06-14-44-55.gh-issue-133517.Ca6NgW.rst
@@ -0,0 +1,2 @@
+Remove :func:`os.listdrives`, :func:`os.listvolumes` and :func:`os.listmounts`
+in non Windows desktop builds since the underlying functionality is missing.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 6b8cc3d07ab01c..3621a0625411d3 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -1659,7 +1659,7 @@ os_listdir(PyObject *module, PyObject *const *args,
Py_ssize_t nargs, PyObject *
return return_value;
}
-#if defined(MS_WINDOWS)
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
PyDoc_STRVAR(os_listdrives__doc__,
"listdrives($module, /)\n"
@@ -1681,9 +1681,9 @@ os_listdrives(PyObject *module, PyObject
*Py_UNUSED(ignored))
return os_listdrives_impl(module);
}
-#endif /* defined(MS_WINDOWS) */
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
-#if defined(MS_WINDOWS)
+#if (defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM))
PyDoc_STRVAR(os_listvolumes__doc__,
"listvolumes($module, /)\n"
@@ -1705,9 +1705,9 @@ os_listvolumes(PyObject *module, PyObject
*Py_UNUSED(ignored))
return os_listvolumes_impl(module);
}
-#endif /* defined(MS_WINDOWS) */
+#endif /* (defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM)) */
-#if defined(MS_WINDOWS)
+#if (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM))
PyDoc_STRVAR(os_listmounts__doc__,
"listmounts($module, /, volume)\n"
@@ -1774,7 +1774,7 @@ os_listmounts(PyObject *module, PyObject *const *args,
Py_ssize_t nargs, PyObjec
return return_value;
}
-#endif /* defined(MS_WINDOWS) */
+#endif /* (defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)) */
#if defined(MS_WINDOWS)
@@ -13398,4 +13398,4 @@ os__emscripten_debugger(PyObject *module, PyObject
*Py_UNUSED(ignored))
#ifndef OS__EMSCRIPTEN_DEBUGGER_METHODDEF
#define OS__EMSCRIPTEN_DEBUGGER_METHODDEF
#endif /* !defined(OS__EMSCRIPTEN_DEBUGGER_METHODDEF) */
-/*[clinic end generated code: output=f7b5635e0b948be4 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ae64df0389746258 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 922694fa367ac3..2bb5f387e44ef8 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -4698,7 +4698,7 @@ os_listdir_impl(PyObject *module, path_t *path)
}
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)
/*[clinic input]
os.listdrives
@@ -4747,6 +4747,10 @@ os_listdrives_impl(PyObject *module)
return result;
}
+#endif /* MS_WINDOWS_DESKTOP || MS_WINDOWS_SYSTEM */
+
+#if defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM)
+
/*[clinic input]
os.listvolumes
@@ -4808,6 +4812,9 @@ os_listvolumes_impl(PyObject *module)
return result;
}
+#endif /* MS_WINDOWS_APP || MS_WINDOWS_SYSTEM */
+
+#if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_SYSTEM)
/*[clinic input]
os.listmounts
@@ -4888,6 +4895,9 @@ os_listmounts_impl(PyObject *module, path_t *volume)
return result;
}
+#endif /* MS_WINDOWS_DESKTOP || MS_WINDOWS_SYSTEM */
+
+#ifdef MS_WINDOWS
/*[clinic input]
os._path_isdevdrive
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
