Shenanigans.

Author: ZeroIntensity

.github/workflows/build.yml

@@ -13,12 +13,6 @@ env:
     SKBUILD_CMAKE_BUILD_TYPE: "Release"
     CIBW_SKIP: >
         pp*
-<<<<<<< HEAD
-    PYTHONMALLOC: "malloc"
-    PYTHONDEVMODE: "1"
-    HATCH_VERBOSE: "1"
-=======
->>>>>>> b9b43de5bfda018d39bedd5d278e1e1db3c8bf58
 
 jobs:
     binary-wheels-standard:

.github/workflows/memory_check.yml

@@ -29,15 +29,10 @@ jobs:
               with:
                   python-version: 3.12
 
-<<<<<<< HEAD
-            - name: Install Hatch
-              run: pip install hatch
-=======
             - name: Install Pytest
               run: |
                   pip install pytest pytest-asyncio pytest-memray
               shell: bash
->>>>>>> b9b43de5bfda018d39bedd5d278e1e1db3c8bf58
 
             - name: Build view.py
               run: pip install .[full]

.github/workflows/tests.yml

@@ -37,22 +37,11 @@ jobs:
               with:
                   python-version: ${{ matrix.python-version }}
 
-<<<<<<< HEAD
-            - name: Install Hatch
-              run: pip install hatch
-
-            - name: Build project
-              run: pip install .[full]
-
-            - name: Run tests
-              run: hatch run test:no-cov
-=======
-            - name:  Install Pytest
+            - name: Install Pytest
               run: pip install pytest pytest-asyncio
-    
+
             - name: Build view.py
               run: pip install .[full]
 
             - name: Run tests
               run: pytest -x
->>>>>>> b9b43de5bfda018d39bedd5d278e1e1db3c8bf58

.gitignore

@@ -8,6 +8,7 @@ __pycache__/
 # LSP
 .vscode/
 compile_flags.txt
+pyawaitable.h
 
 # View Configurations
 view.toml

src/_view/app.c

@@ -184,6 +184,7 @@ new(PyTypeObject *tp, PyObject *args, PyObject *kwds)
         self->server_errors[i] = NULL;
 
     self->has_path_params = false;
+    self->error_type = NULL;
 
     return (PyObject *) self;
 }
@@ -230,6 +231,8 @@ lifespan(PyObject *awaitable, PyObject *result)
         result,
         "type"
     );
+    if (tp == NULL)
+        return PyErr_BadASGI();
     const char *type = PyUnicode_AsUTF8(tp);
 
     bool is_startup = !strcmp(
@@ -1191,6 +1194,7 @@ register_error(ViewApp *self, PyObject *args)
     }
 
     self->error_type = Py_NewRef(type);
+    printf("a self->error_type: %p\n", self->error_type);
     Py_RETURN_NONE;
 }
 

src/_view/errors.c

@@ -329,7 +329,7 @@ finalize_err_cb(PyObject *awaitable, PyObject *result)
     PyObject *raw_path;
     const char *method_str;
     route *r;
-    int is_http;
+    long is_http;
 
     if (
         PyAwaitable_UnpackValues(
@@ -767,75 +767,78 @@ route_error(
     )
         return -1;
 
-    int is_http;
+    long is_http;
 
     if (PyAwaitable_UnpackIntValues(awaitable, &is_http) < 0)
         return -1;
 
-    if (PyErr_GivenExceptionMatches(err, self->error_type))
-    {
-        PyObject *status_obj = PyObject_GetAttrString(
-            err,
-            "status"
-        );
-        if (!status_obj)
-            return -2;
+    if (self->error_type != NULL)
+        // Under general cirumstances, error_type should never
+        // be NULL. But, we might as well support it.
+        if (PyErr_GivenExceptionMatches(err, self->error_type))
+        {
+            PyObject *status_obj = PyObject_GetAttrString(
+                err,
+                "status"
+            );
+            if (!status_obj)
+                return -2;
 
-        PyObject *msg_obj = PyObject_GetAttrString(
-            err,
-            "message"
-        );
+            PyObject *msg_obj = PyObject_GetAttrString(
+                err,
+                "message"
+            );
 
-        if (!msg_obj)
-        {
-            Py_DECREF(status_obj);
-            return -2;
-        }
+            if (!msg_obj)
+            {
+                Py_DECREF(status_obj);
+                return -2;
+            }
 
-        int status = PyLong_AsLong(status_obj);
-        if ((status == -1) && PyErr_Occurred())
-        {
-            Py_DECREF(status_obj);
-            Py_DECREF(msg_obj);
-            return -2;
-        }
+            int status = PyLong_AsLong(status_obj);
+            if ((status == -1) && PyErr_Occurred())
+            {
+                Py_DECREF(status_obj);
+                Py_DECREF(msg_obj);
+                return -2;
+            }
 
-        const char *message = NULL;
+            const char *message = NULL;
 
-        if (msg_obj != Py_None)
-        {
-            message = PyUnicode_AsUTF8(msg_obj);
-            if (!message)
+            if (msg_obj != Py_None)
+            {
+                message = PyUnicode_AsUTF8(msg_obj);
+                if (!message)
+                {
+                    Py_DECREF(status_obj);
+                    Py_DECREF(msg_obj);
+                    return -2;
+                }
+            }
+
+            if (
+                fire_error(
+                    self,
+                    awaitable,
+                    status,
+                    r,
+                    NULL,
+                    message,
+                    method_str,
+                    is_http
+                ) < 0
+            )
             {
                 Py_DECREF(status_obj);
                 Py_DECREF(msg_obj);
                 return -2;
             }
-        }
 
-        if (
-            fire_error(
-                self,
-                awaitable,
-                status,
-                r,
-                NULL,
-                message,
-                method_str,
-                is_http
-            ) < 0
-        )
-        {
             Py_DECREF(status_obj);
             Py_DECREF(msg_obj);
-            return -2;
+            return 0;
         }
 
-        Py_DECREF(status_obj);
-        Py_DECREF(msg_obj);
-        return 0;
-    }
-
     if (!is_http)
     {
         // send a websocket error code