bpo-38348: Extend command line options of ast parsing tool (GH-16540)

Add -i and --indent (indentation level), and --no-type-comments
(type comments) command line options to ast parsing tool.

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index a7e0729b902d2c99db26ba4e3a4f069b395859c5..baf563f5d7877e65e19d2bd36fb9917c1e34ac56 100644 (file)
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -381,10 +381,19 @@ The following options are accepted:
    Specify what kind of code must be compiled, like the *mode* argument
    in :func:`parse`.
 
+.. cmdoption:: --no-type-comments
+
+   Don't parse type comments.
+
 .. cmdoption:: -a, --include-attributes
 
    Include attributes such as line numbers and column offsets.
 
+.. cmdoption:: -i <indent>
+               --indent <indent>
+
+   Indentation of nodes in AST (number of spaces).
+
 If :file:`infile` is specified its contents are parsed to AST and dumped
 to stdout.  Otherwise, the content is read from stdin.
 

diff --git a/Lib/ast.py b/Lib/ast.py
index 13ae9e0a70eae0abf75c88b3ed22daf7e5d6ddee..ee3f74358ee120bf236824b3c3228757fe9b5386 100644 (file)
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -1258,15 +1258,19 @@ def main():
     parser.add_argument('-m', '--mode', default='exec',
                         choices=('exec', 'single', 'eval', 'func_type'),
                         help='specify what kind of code must be parsed')
+    parser.add_argument('--no-type-comments', default=True, action='store_false',
+                        help="don't add information about type comments")
     parser.add_argument('-a', '--include-attributes', action='store_true',
                         help='include attributes such as line numbers and '
                              'column offsets')
+    parser.add_argument('-i', '--indent', type=int, default=3,
+                        help='indentation of nodes (number of spaces)')
     args = parser.parse_args()
 
     with args.infile as infile:
         source = infile.read()
-    tree = parse(source, args.infile.name, args.mode, type_comments=True)
-    print(dump(tree, include_attributes=args.include_attributes, indent=3))
+    tree = parse(source, args.infile.name, args.mode, type_comments=args.no_type_comments)
+    print(dump(tree, include_attributes=args.include_attributes, indent=args.indent))
 
 if __name__ == '__main__':
     main()

diff --git a/Misc/NEWS.d/next/Library/2019-10-02-18-15-28.bpo-38348._-5eq2.rst b/Misc/NEWS.d/next/Library/2019-10-02-18-15-28.bpo-38348._-5eq2.rst
new file mode 100644 (file)
index 0000000..5ca72de
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-10-02-18-15-28.bpo-38348._-5eq2.rst
@@ -0,0 +1,2 @@
+Add ``-i`` and ``--indent`` (indentation level), and ``--no-type-comments``
+(type comments) command line options to ast parsing tool.