fixes #2

Author: jph00

fasthtml/core.py

@@ -111,7 +111,7 @@ async def _find_p(req, arg:str, p):
     if not res: res = req.query_params.get(arg, None)
     if not res: res = req.cookies.get(arg, None)
     if not res: res = req.headers.get(snake2hyphens(arg), None)
-    if not res: res = nested_idx(req.scope, 'session', arg)
+    if not res: res = nested_idx(req.scope, 'session', arg) or None
     if res is empty or res is None:
         body = await req.form()
         res = body.get(arg, None)

nbs/core_tests.ipynb

@@ -421,13 +421,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-06-03 12:46:09.633470\n"
+      "Set to 2024-06-04 09:37:31.288381\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Cookie was set at time 12:46:09.633470'"
+       "'Cookie was set at time 09:37:31.288381'"
       ]
      },
      "execution_count": null,
@@ -468,13 +468,13 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Set to 2024-06-03 12:46:10.556040\n"
+      "Set to 2024-06-04 09:37:31.332236\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "'Session time: 12:46:10.556040'"
+       "'Session time: 09:37:31.332236'"
       ]
      },
      "execution_count": null,
@@ -491,25 +491,49 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "021778d1",
+   "id": "4121c4ab",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "# Release notes\n",
+      "\n",
+      "<!-- do not remove -->\n",
+      "\n",
+      "## 0.0.3\n",
+      "\n",
+      "- Init release\n",
+      "\n",
+      "\n"
+     ]
+    }
+   ],
    "source": [
-    "auth = user_pwd_auth('testuser', 'spycraft')\n",
-    "app = FastHTML(middleware=[auth])\n",
-    "cli = TestClient(app)\n",
-    "rt = app.route"
+    "@rt(\"/upload\")\n",
+    "async def post(uploadfile:str):\n",
+    "    return (await uploadfile.read()).decode()\n",
+    "\n",
+    "fn = '../CHANGELOG.md'\n",
+    "data = {'message': 'Hello, world!'}\n",
+    "with open(fn, 'rb') as f:\n",
+    "    print(cli.post('/upload', files={'uploadfile': f}, data=data).text)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "b46ae684",
+   "id": "90341316",
    "metadata": {},
    "outputs": [],
    "source": [
-    "@rt(\"/locked\")\n",
-    "def get(req): return 'Hello, ' + req.user.display_name\n",
+    "auth = user_pwd_auth(testuser='spycraft')\n",
+    "app = FastHTML(middleware=[auth])\n",
+    "cli = TestClient(app)\n",
+    "\n",
+    "@app.route(\"/locked\")\n",
+    "def get(auth): return 'Hello, ' + auth\n",
     "\n",
     "test_eq(cli.get('/locked').text, 'not authenticated')\n",
     "test_eq(cli.get('/locked', auth=(\"testuser\",\"spycraft\")).text, 'Hello, testuser')"