Merged with the default branch.1.27.0-1

2 files changed, 15 insertions, 17 deletions

diff --git a/src/python/nxt_python.c b/src/python/nxt_python.c
index 8687c869..188c4920 100644
--- a/src/python/nxt_python.c
+++ b/src/python/nxt_python.c
@@ -411,15 +411,8 @@ nxt_python_set_path(nxt_task_t *task, nxt_conf_value_t *value)
 
     /* sys is a Borrowed reference. */
 
-    if (nxt_conf_type(value) == NXT_CONF_STRING) {
-        n = 0;
-        goto value_is_string;
-    }
-
-    /* NXT_CONF_ARRAY */
     array = value;
-
-    n = nxt_conf_array_elements_count(array);
+    n = nxt_conf_array_elements_count_or_1(array);
 
     while (n != 0) {
         n--;
@@ -430,9 +423,7 @@ nxt_python_set_path(nxt_task_t *task, nxt_conf_value_t *value)
          * specified in the "path" option.
          */
 
-        value = nxt_conf_get_array_element(array, n);
-
-    value_is_string:
+        value = nxt_conf_get_array_element_or_itself(array, n);
 
         nxt_conf_get_string(value, &str);
 
diff --git a/src/python/nxt_python_asgi.c b/src/python/nxt_python_asgi.c
index 354e3a81..91af8f4b 100644
--- a/src/python/nxt_python_asgi.c
+++ b/src/python/nxt_python_asgi.c
@@ -117,15 +117,20 @@ nxt_python_asgi_get_func(PyObject *obj)
     if (PyMethod_Check(call)) {
         obj = PyMethod_GET_FUNCTION(call);
 
-        Py_INCREF(obj);
-        Py_DECREF(call);
+        if (PyFunction_Check(obj)) {
+            Py_INCREF(obj);
 
-        return obj;
+        } else {
+            obj = NULL;
+        }
+
+    } else {
+        obj = NULL;
     }
 
     Py_DECREF(call);
 
-    return NULL;
+    return obj;
 }
 
 
@@ -161,8 +166,10 @@ nxt_python_asgi_init(nxt_unit_init_t *init, nxt_python_proto_t *proto)
     for (i = 0; i < nxt_py_targets->count; i++) {
         func = nxt_python_asgi_get_func(nxt_py_targets->target[i].application);
         if (nxt_slow_path(func == NULL)) {
-            nxt_unit_alert(NULL, "Python cannot find function for callable");
-            return NXT_UNIT_ERROR;
+            nxt_unit_debug(NULL, "asgi: cannot find function for callable, "
+                                 "unable to check for legacy mode (#%d)",
+                                 (int) i);
+            continue;
         }
 
         code = (PyCodeObject *) PyFunction_GET_CODE(func);