Restoring authorship annotation for <deshevoy@yandex-team.ru>. Commit 2 of 2.

1 files changed, 129 insertions, 129 deletions

diff --git a/library/python/runtime_py3/main/main.c b/library/python/runtime_py3/main/main.c
index 75af2f8cde..3159800615 100644
--- a/library/python/runtime_py3/main/main.c
+++ b/library/python/runtime_py3/main/main.c
@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <locale.h> 
+#include <locale.h>
 
 void Py_InitArgcArgv(int argc, wchar_t **argv);
 char* GetPyMain();
@@ -24,77 +24,77 @@ void unsetenv(const char* name) {
 }
 #endif
 
-static int RunModule(const char *modname) 
-{ 
-    PyObject *module, *runpy, *runmodule, *runargs, *result; 
-    runpy = PyImport_ImportModule("runpy"); 
-    if (runpy == NULL) { 
-        fprintf(stderr, "Could not import runpy module\n"); 
-        PyErr_Print(); 
-        return -1; 
-    } 
-    runmodule = PyObject_GetAttrString(runpy, "_run_module_as_main"); 
-    if (runmodule == NULL) { 
-        fprintf(stderr, "Could not access runpy._run_module_as_main\n"); 
-        PyErr_Print(); 
-        Py_DECREF(runpy); 
-        return -1; 
-    } 
-    module = PyUnicode_FromString(modname); 
-    if (module == NULL) { 
-        fprintf(stderr, "Could not convert module name to unicode\n"); 
-        PyErr_Print(); 
-        Py_DECREF(runpy); 
-        Py_DECREF(runmodule); 
-        return -1; 
-    } 
-    runargs = Py_BuildValue("(Oi)", module, 0); 
-    if (runargs == NULL) { 
-        fprintf(stderr, 
-            "Could not create arguments for runpy._run_module_as_main\n"); 
-        PyErr_Print(); 
-        Py_DECREF(runpy); 
-        Py_DECREF(runmodule); 
-        Py_DECREF(module); 
-        return -1; 
-    } 
-    result = PyObject_Call(runmodule, runargs, NULL); 
-    if (result == NULL) { 
-        PyErr_Print(); 
-    } 
-    Py_DECREF(runpy); 
-    Py_DECREF(runmodule); 
-    Py_DECREF(module); 
-    Py_DECREF(runargs); 
-    if (result == NULL) { 
-        return -1; 
-    } 
-    Py_DECREF(result); 
-    return 0; 
-} 
- 
+static int RunModule(const char *modname)
+{
+    PyObject *module, *runpy, *runmodule, *runargs, *result;
+    runpy = PyImport_ImportModule("runpy");
+    if (runpy == NULL) {
+        fprintf(stderr, "Could not import runpy module\n");
+        PyErr_Print();
+        return -1;
+    }
+    runmodule = PyObject_GetAttrString(runpy, "_run_module_as_main");
+    if (runmodule == NULL) {
+        fprintf(stderr, "Could not access runpy._run_module_as_main\n");
+        PyErr_Print();
+        Py_DECREF(runpy);
+        return -1;
+    }
+    module = PyUnicode_FromString(modname);
+    if (module == NULL) {
+        fprintf(stderr, "Could not convert module name to unicode\n");
+        PyErr_Print();
+        Py_DECREF(runpy);
+        Py_DECREF(runmodule);
+        return -1;
+    }
+    runargs = Py_BuildValue("(Oi)", module, 0);
+    if (runargs == NULL) {
+        fprintf(stderr,
+            "Could not create arguments for runpy._run_module_as_main\n");
+        PyErr_Print();
+        Py_DECREF(runpy);
+        Py_DECREF(runmodule);
+        Py_DECREF(module);
+        return -1;
+    }
+    result = PyObject_Call(runmodule, runargs, NULL);
+    if (result == NULL) {
+        PyErr_Print();
+    }
+    Py_DECREF(runpy);
+    Py_DECREF(runmodule);
+    Py_DECREF(module);
+    Py_DECREF(runargs);
+    if (result == NULL) {
+        return -1;
+    }
+    Py_DECREF(result);
+    return 0;
+}
+
 static int pymain(int argc, char** argv) {
     PyStatus status = _PyRuntime_Initialize();
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
 
-    int i, sts = 1; 
+    int i, sts = 1;
     char* oldloc = NULL;
     wchar_t** argv_copy = NULL;
-    /* We need a second copies, as Python might modify the first one. */ 
+    /* We need a second copies, as Python might modify the first one. */
     wchar_t** argv_copy2 = NULL;
-    char* entry_point_copy = NULL; 
- 
-    if (argc > 0) { 
-        argv_copy = PyMem_RawMalloc(sizeof(wchar_t*) * argc); 
-        argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*) * argc); 
-        if (!argv_copy || !argv_copy2) { 
-            fprintf(stderr, "out of memory\n"); 
-            goto error; 
-        } 
-    } 
- 
+    char* entry_point_copy = NULL;
+
+    if (argc > 0) {
+        argv_copy = PyMem_RawMalloc(sizeof(wchar_t*) * argc);
+        argv_copy2 = PyMem_RawMalloc(sizeof(wchar_t*) * argc);
+        if (!argv_copy || !argv_copy2) {
+            fprintf(stderr, "out of memory\n");
+            goto error;
+        }
+    }
+
     PyConfig config;
     PyConfig_InitPythonConfig(&config);
     config.pathconfig_warnings = 0;   /* Suppress errors from getpath.c */
@@ -104,27 +104,27 @@ static int pymain(int argc, char** argv) {
         config.bytes_warning = atoi(bytes_warning);
     }
 
-    oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL)); 
-    if (!oldloc) { 
-        fprintf(stderr, "out of memory\n"); 
-        goto error; 
-    } 
- 
-    setlocale(LC_ALL, ""); 
-    for (i = 0; i < argc; i++) { 
-        argv_copy[i] = Py_DecodeLocale(argv[i], NULL); 
-        argv_copy2[i] = argv_copy[i]; 
-        if (!argv_copy[i]) { 
-            fprintf(stderr, "Unable to decode the command line argument #%i\n", 
+    oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL));
+    if (!oldloc) {
+        fprintf(stderr, "out of memory\n");
+        goto error;
+    }
+
+    setlocale(LC_ALL, "");
+    for (i = 0; i < argc; i++) {
+        argv_copy[i] = Py_DecodeLocale(argv[i], NULL);
+        argv_copy2[i] = argv_copy[i];
+        if (!argv_copy[i]) {
+            fprintf(stderr, "Unable to decode the command line argument #%i\n",
                             i + 1);
-            argc = i; 
-            goto error; 
-        } 
-    } 
-    setlocale(LC_ALL, oldloc); 
-    PyMem_RawFree(oldloc); 
-    oldloc = NULL; 
- 
+            argc = i;
+            goto error;
+        }
+    }
+    setlocale(LC_ALL, oldloc);
+    PyMem_RawFree(oldloc);
+    oldloc = NULL;
+
     if (argc >= 1)
         Py_SetProgramName(argv_copy[0]);
 
@@ -156,10 +156,10 @@ static int pymain(int argc, char** argv) {
         free(entry_point_copy);
         return sts;
     }
- 
+
     Py_InitArgcArgv(argc, argv_copy);
-    PySys_SetArgv(argc, argv_copy); 
- 
+    PySys_SetArgv(argc, argv_copy);
+
     {
         PyObject* module = PyImport_ImportModule("library.python.runtime_py3.entry_points");
         if (module == NULL) {
@@ -175,53 +175,53 @@ static int pymain(int argc, char** argv) {
         }
     }
 
-    const char* module_name = entry_point_copy; 
-    const char* func_name = NULL; 
- 
-    char *colon = strchr(entry_point_copy, ':'); 
-    if (colon != NULL) { 
-        colon[0] = '\0'; 
-        func_name = colon + 1; 
-    } 
+    const char* module_name = entry_point_copy;
+    const char* func_name = NULL;
+
+    char *colon = strchr(entry_point_copy, ':');
+    if (colon != NULL) {
+        colon[0] = '\0';
+        func_name = colon + 1;
+    }
     if (module_name[0] == '\0') {
         module_name = "library.python.runtime_py3.entry_points";
     }
- 
-    if (!func_name) { 
-        sts = RunModule(module_name); 
-    } else { 
-        PyObject* module = PyImport_ImportModule(module_name); 
- 
-        if (module == NULL) { 
-            PyErr_Print(); 
-        } else { 
+
+    if (!func_name) {
+        sts = RunModule(module_name);
+    } else {
+        PyObject* module = PyImport_ImportModule(module_name);
+
+        if (module == NULL) {
+            PyErr_Print();
+        } else {
             PyObject* value = PyObject_CallMethod(module, func_name, NULL);
- 
-            if (value == NULL) { 
-                PyErr_Print(); 
-            } else { 
-                Py_DECREF(value); 
-                sts = 0; 
-            } 
- 
-            Py_DECREF(module); 
-        } 
-    } 
- 
-    if (Py_FinalizeEx() < 0) { 
-        sts = 120; 
-    } 
- 
-error: 
-    free(entry_point_copy); 
-    PyMem_RawFree(argv_copy); 
-    if (argv_copy2) { 
-        for (i = 0; i < argc; i++) 
-            PyMem_RawFree(argv_copy2[i]); 
-        PyMem_RawFree(argv_copy2); 
-    } 
-    PyMem_RawFree(oldloc); 
-    return sts; 
+
+            if (value == NULL) {
+                PyErr_Print();
+            } else {
+                Py_DECREF(value);
+                sts = 0;
+            }
+
+            Py_DECREF(module);
+        }
+    }
+
+    if (Py_FinalizeEx() < 0) {
+        sts = 120;
+    }
+
+error:
+    free(entry_point_copy);
+    PyMem_RawFree(argv_copy);
+    if (argv_copy2) {
+        for (i = 0; i < argc; i++)
+            PyMem_RawFree(argv_copy2[i]);
+        PyMem_RawFree(argv_copy2);
+    }
+    PyMem_RawFree(oldloc);
+    return sts;
 }
 
 int (*mainptr)(int argc, char** argv) = pymain;