python · pablogsal · Mar 8, 2019 · Mar 9, 2019
diff --git a/Include/internal/pycore_pathconfig.h b/Include/internal/pycore_pathconfig.h
@@ -44,7 +44,8 @@ PyAPI_FUNC(_PyInitError) _PyPathConfig_SetGlobal(
 PyAPI_FUNC(_PyInitError) _PyPathConfig_Calculate_impl(
     _PyPathConfig *config,
     const _PyCoreConfig *core_config);
-PyAPI_FUNC(PyObject*) _PyPathConfig_ComputeArgv0(int argc, wchar_t **argv);
+PyAPI_FUNC(_PyInitError) _PyPathConfig_ComputeArgv0(int argc, wchar_t **argv,
+                                                 PyObject **result);
 PyAPI_FUNC(int) _Py_FindEnvConfigValue(
     FILE *env_file,
     const wchar_t *key,

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-03-09-17-48-18.bpo-36236.FzW2Mf.rst b/Misc/NEWS.d/next/Core and Builtins/2019-03-09-17-48-18.bpo-36236.FzW2Mf.rst
@@ -0,0 +1,2 @@
+Improve the error message that occurs when executing :code:`python -m
+modulename` from a deleted directory on MacOS.
diff --git a/Modules/main.c b/Modules/main.c
@@ -784,10 +784,12 @@ pymain_run_python(PyInterpreterState *interp, int *exitcode)
         }
     }
     else if (!config->preconfig.isolated) {
-        PyObject *path0 = _PyPathConfig_ComputeArgv0(config->argc,
-                                                     config->argv);
+        PyObject *path0 = NULL;
+        _PyInitError error = _PyPathConfig_ComputeArgv0(config->argc,
+                                                        config->argv,
+                                                        &path0);
         if (path0 == NULL) {
-            err = _Py_INIT_NO_MEMORY();
+            err  = error;
             goto done;
         }
 

diff --git a/Python/pathconfig.c b/Python/pathconfig.c
@@ -566,8 +566,8 @@ Py_GetProgramName(void)
 }
 
 /* Compute argv[0] which will be prepended to sys.argv */
-PyObject*
-_PyPathConfig_ComputeArgv0(int argc, wchar_t **argv)
+_PyInitError
+_PyPathConfig_ComputeArgv0(int argc, wchar_t **argv, PyObject** result)
 {
     wchar_t *argv0;
     wchar_t *p = NULL;
@@ -584,6 +584,7 @@ _PyPathConfig_ComputeArgv0(int argc, wchar_t **argv)
 #elif defined(MS_WINDOWS)
     wchar_t fullpath[MAX_PATH];
 #endif
+    assert(*result == NULL);
 
     argv0 = argv[0];
     if (argc > 0 && argv0 != NULL) {
@@ -593,7 +594,9 @@ _PyPathConfig_ComputeArgv0(int argc, wchar_t **argv)
 
     if (have_module_arg) {
         #if defined(HAVE_REALPATH) || defined(MS_WINDOWS)
-            _Py_wgetcwd(fullpath, Py_ARRAY_LENGTH(fullpath));
+            if (!_Py_wgetcwd(fullpath, Py_ARRAY_LENGTH(fullpath))) {
+                return _Py_INIT_USER_ERR("Failed the obtain current directory");
+            }
             argv0 = fullpath;
             n = wcslen(argv0);
         #else
@@ -671,8 +674,11 @@ _PyPathConfig_ComputeArgv0(int argc, wchar_t **argv)
 #endif /* Unix */
     }
 #endif /* All others */
-
-    return PyUnicode_FromWideChar(argv0, n);
+    *result = PyUnicode_FromWideChar(argv0, n);
+    if (*result == NULL) {
+        return _Py_INIT_NO_MEMORY();
+    }
+    return _Py_INIT_OK();
 }
 
 

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -2780,7 +2780,8 @@ PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath)
     if (updatepath) {
         /* If argv[0] is not '-c' nor '-m', prepend argv[0] to sys.path.
            If argv[0] is a symlink, use the real path. */
-        PyObject *argv0 = _PyPathConfig_ComputeArgv0(argc, argv);
+        PyObject *argv0 = NULL;
+        _PyPathConfig_ComputeArgv0(argc, argv, &argv0);
         if (argv0 == NULL) {
             Py_FatalError("can't compute path0 from argv");
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Improve the error message that occurs when executing :code:`python -m
		modulename` from a deleted directory on MacOS.