f-string is simpler to read

stonebig · stonebig · commit dfc7a2d6c761 · 2022-08-13T00:58:50.000+02:00
diff --git a/docs/pipdeptree_replacement.ipynb b/docs/pipdeptree_replacement.ipynb
@@ -101,18 +101,17 @@
     "\n",
     "\n",
     "def pipdownraw(pp, extra=\"\", version_req=\"\", depth=20, path=[]):\n",
+    "    \"\"\"build downward requirements for the package on given extra and depth\"\"\"\n",
     "    envi = {\"extra\": extra, **environment}\n",
     "    p = normalize(pp)\n",
     "    ret_all = []\n",
     "    if p in path:\n",
     "        print(\"cycle!\", \"->\".join(path + [p]))\n",
     "    elif p in distro and len(path) <= depth:\n",
     "        if extra == \"\":\n",
-    "            ret = [p + \"==\" + distro[p][\"version\"] + \" \" + version_req]\n",
+    "            ret = [f'{p}=={distro[p][\"version\"]} {version_req}']\n",
     "        else:\n",
-    "            ret = [\n",
-    "                p + \"[\" + extra + \"]\" + \"==\" + distro[p][\"version\"] + \" \" + version_req\n",
-    "            ]\n",
+    "            ret = [f'{p}[{extra}]=={distro[p][\"version\"]} {version_req}']\n",
     "        for r in distro[p][\"requires_dist\"]:\n",
     "            if r[\"req_key\"] in distro:\n",
     "                if \"req_marker\" not in r or Marker(r[\"req_marker\"]).evaluate(\n",
@@ -130,21 +129,17 @@
     "\n",
     "\n",
     "def pipupraw(pp, extra=\"\", version_req=\"\", depth=20, path=[]):\n",
+    "    \"\"\"build upward needs for the package on given extra and depth\"\"\"\n",
     "    envi = {\"extra\": extra, **environment}\n",
     "    p = normalize(pp)\n",
     "    ret_all = []\n",
     "    if p in path:\n",
     "        print(\"cycle!\", \"->\".join(path + [p]))\n",
     "    if p in distro and len(path) <= depth:\n",
     "        if extra == \"\":\n",
-    "            ret_all = [p + \"==\" + distro[p][\"version\"] + \" \" + version_req]\n",
+    "            ret_all = [f'{p}=={distro[p][\"version\"]} {version_req}']\n",
     "        else:\n",
-    "            ret_all = [\n",
-    "                p + \"[\" + extra + \"]\" + \"==\" + distro[p][\"version\"] + \" \" + version_req\n",
-    "            ]\n",
-    "        if len(path) > 20:\n",
-    "            print(path)\n",
-    "            z = 1 / 0\n",
+    "            ret_all = [f'{p}[{extra}]=={distro[p][\"version\"]} {version_req}']\n",
     "        ret = []\n",
     "        for r in distro[p][\"wanted_per\"]:\n",
     "            # print(distro[p]['wanted_per'][r]['req,_version'])\n",
@@ -156,11 +151,9 @@
     "                    ret += pipupraw(\n",
     "                        r[\"req_key\"],\n",
     "                        \"\",\n",
-    "                        \"[requires: \"\n",
-    "                        + p\n",
+    "                        f\"[requires: {p}\"\n",
     "                        + (\"[\" + r[\"req_extra\"] + \"]\" if r[\"req_extra\"] != \"\" else \"\")\n",
-    "                        + r[\"req_version\"]\n",
-    "                        + \"]\",\n",
+    "                        + f'{r[\"req_version\"]}]',\n",
     "                        depth,\n",
     "                        path + [p],\n",
     "                    )\n",
@@ -425,18 +418,9 @@
     "    meta = p['metadata']\n",
     "    if  meta['name'] in list_of_package:\n",
     "         # print(json.dumps(meta).split(r'\\n'))\n",
-    "         print('\\n'.join(meta['description'].split(r'\\n')))\n",
-    "\n"
+    "         print('\\n'.join(meta['description'].split(r'\\n')))"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "4898ad0c-5fbf-47a6-9298-f4f25841c25f",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,
