fix silly usage and main -r things

python-security · KevinHock · Jun 6, 2018 · Apr 21, 2018 · Apr 21, 2018 · Apr 21, 2018
commit 0f5fb431c0ac6d804d54439e266da4c70addae84
diff --git a/pyt/__main__.py b/pyt/__main__.py
@@ -5,23 +5,23 @@
 
 from .analysis.constraint_table import initialize_constraint_table
 from .analysis.fixed_point import analyse
-from .ast_helper import generate_ast
 from .cfg import make_cfg
+from .core.ast_helper import generate_ast
+from .core.project_handler import (
+    get_directory_modules,
+    get_modules
+)
 from .formatters import (
     json,
     text
 )
-from .project_handler import (
-    get_directory_modules,
-    get_modules
-)
 from .usage import parse_args
 from .vulnerabilities import (
     find_vulnerabilities,
     get_vulnerabilities_not_in_baseline,
     UImode
 )
-from pyt.web_frameworks import (
+from .web_frameworks import (
     FrameworkAdaptor,
     is_django_view_function,
     is_flask_route_function,

diff --git a/pyt/usage.py b/pyt/usage.py
@@ -96,10 +96,10 @@ def _add_print_group(parser):
 
 
 def _check_required_and_mutually_exclusive_args(parser, args):
-    if args.filepath is None and args.git_repos is None:
-        parser.error('one of the arguments -f/--filepath -gr/--git-repos is required')
-    if args.filepath and args.git_repos:
-        parser.error('argument -f/--filepath: not allowed with argument -gr/--git-repos')
+    if args.filepath is None and args.root_directory is None:
+        parser.error('one of the arguments -f/--filepath -r/--root-directory is required')
+    if args.filepath and args.root_directory:
+        parser.error('argument -f/--filepath: not allowed with argument -r/--root-directory')
     if args.trim_reassigned_in and args.interactive:
         parser.error('argument -i/--interactive: not allowed with argument -trim/--trim-reassigned-in')