refactor: merge funcs and maian modules

jnoortheen · Nov 9, 2020 · fd0ab1c · fd0ab1c
1 parent 37810d6
commit fd0ab1c
Show file tree

Hide file tree

Showing 6 changed files with 203 additions and 217 deletions.
diff --git a/arger/__init__.py b/arger/__init__.py
@@ -1,8 +1,6 @@
 from pkg_resources import DistributionNotFound, get_distribution
 
-from arger.funcs import Argument, Option
-
-from .main import Arger
+from .main import Arger, Argument, Option
 
 try:
     __version__ = get_distribution("arger").version

diff --git a/arger/docstring.py b/arger/docstring.py
@@ -144,9 +144,8 @@ def get_parsers():
 
 
 def parse_docstring(func: tp.Optional[tp.Callable]) -> DocstringTp:
-    doc = ''
-    if func:
-        doc = inspect.getdoc(func)
+    doc = (inspect.getdoc(func) or '') if func else ''
+    if doc:
         for parser in get_parsers():
             if parser.matches(doc):
                 return parser.parse(doc)

diff --git a/arger/funcs.py b/arger/funcs.py