Added parsing of imports within try/except (#32)

Author: Florian Maas

README.md

@@ -47,12 +47,6 @@ To scan your project for obsolete imports, run
 deptry .
 ```
 
-or for a more verbose version
-
-```sh
-deptry . -v
-```
-
 __deptry__ can be configured by using additional command line arguments, or 
 by adding a `[tool.deptry]` section in __pyproject.toml__.
 

deptry/import_parser.py

@@ -59,7 +59,7 @@ def _get_import_nodes_from(self, root: Union[ast.Module, ast.If]):
         """
         imports = []
         for node in ast.iter_child_nodes(root):
-            if isinstance(node, ast.If):
+            if isinstance(node, ast.If) or isinstance(node, ast.Try) or isinstance(node, ast.ExceptHandler):
                 imports += self._get_import_nodes_from(node)
             elif isinstance(node, ast.Import) or isinstance(node, ast.ImportFrom):
                 imports += [node]

docs/docs/index.md

@@ -43,12 +43,5 @@ To scan your project for obsolete imports, run
 deptry .
 ```
 
-which might output:
-
-```
-pyproject.toml contains obsolete dependencies: ['pandas', 'numpy']
-```
-
 _deptry_ can be configured by using additional command line arguments, or 
-by adding a `[tool.deptry]` section in _pyproject.toml_. For more information, see the [Usage and Configuration](./usage.md)
-
+by adding a `[tool.deptry]` section in _pyproject.toml_. For more information, see [Usage and Configuration](./usage.md)

notebooks/Untitled.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "064f4445-752d-48e7-bbac-72fe198e28a2",
    "metadata": {},
    "outputs": [],
@@ -12,106 +12,69 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "6d2dda83-00d2-407a-87ff-b602b415cb5c",
    "metadata": {},
    "outputs": [],
    "source": [
-    "root = ast.parse(\n",
-    "\"\"\"\n",
-    "x=1\n",
+    "my_py_file = \"\"\"\n",
     "import pandas as pd\n",
     "from numpy import random\n",
-    "if x>0:\n",
+    "try:\n",
     "    import click\n",
-    "elif x<0:\n",
-    "    from typing import List\n",
-    "else:\n",
+    "except:\n",
     "    import logging\n",
-    "\"\"\")"
+    "\"\"\"\n",
+    "root = ast.parse(my_py_file)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "id": "00957720-c90a-47be-bb95-4e59dcc026d3",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "<ast.Module at 0x110524fd0>"
-      ]
-     },
-     "execution_count": 3,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "root"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
    "id": "729215e5-abc3-4dae-98f7-96ab7c41727a",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "<ast.Assign object at 0x110524fa0>\n",
-      "<ast.Import object at 0x110524f10>\n",
-      "<ast.ImportFrom object at 0x110524e50>\n",
-      "<ast.If object at 0x110524e20>\n",
-      "<ast.Compare object at 0x110524be0>\n",
-      "<ast.ImportFrom object at 0x110524b20>\n",
-      "<ast.Import object at 0x1105249a0>\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "for node in ast.iter_child_nodes(root):\n",
     "    print(node)\n",
-    "    if isinstance(node, ast.If):\n",
+    "    if isinstance(node, ast.Try):\n",
     "        for node in ast.iter_child_nodes(node):\n",
-    "            if isinstance(node, ast.If):\n",
+    "            print(node)\n",
+    "            if isinstance(node, ast.Try):\n",
     "                for node in ast.iter_child_nodes(node):\n",
-    "                    print(node)"
+    "                    pass"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
-   "id": "8f70351b-1852-4628-b683-db42be55e943",
+   "execution_count": null,
+   "id": "d4978dbe-2173-404f-a46a-8839e09a4e52",
    "metadata": {},
-   "outputs": [
-    {
-     "ename": "TypeError",
-     "evalue": "'Module' object is not subscriptable",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
-      "Input \u001b[0;32mIn [6]\u001b[0m, in \u001b[0;36m<cell line: 1>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[38;5;28;01mfor\u001b[39;00m node \u001b[38;5;129;01min\u001b[39;00m ast\u001b[38;5;241m.\u001b[39miter_child_nodes(\u001b[43mroot\u001b[49m\u001b[43m[\u001b[49m\u001b[38;5;241;43m3\u001b[39;49m\u001b[43m]\u001b[49m):\n\u001b[1;32m      2\u001b[0m     \u001b[38;5;28mprint\u001b[39m(node)\n",
-      "\u001b[0;31mTypeError\u001b[0m: 'Module' object is not subscriptable"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
-    "for node in ast.iter_child_nodes(root):\n",
-    "    print(node)"
+    "from deptry.import_parser import ImportParser\n",
+    "imported_modules = ImportParser().get_imported_modules_from_str(my_py_file)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "d4978dbe-2173-404f-a46a-8839e09a4e52",
+   "id": "874769dc-5275-469d-9af8-3bf6d6ff0b1e",
    "metadata": {},
    "outputs": [],
-   "source": []
+   "source": [
+    "imported_modules"
+   ]
   }
  ],
  "metadata": {