Skip to content

Commit 8fe372a

Browse files
committed
Update --feature-version option
1 parent 5a2433f commit 8fe372a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Doc/library/ast.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2574,7 +2574,7 @@ The following options are accepted:
25742574

25752575
.. option:: --feature-version <version>
25762576

2577-
Minor version (int) or 3.x tuple (e.g., 3.10).
2577+
Python version in the format 3.x (e.g., 3.10).
25782578

25792579
.. versionadded:: next
25802580

@@ -2587,7 +2587,7 @@ The following options are accepted:
25872587

25882588
.. option:: --show-empty
25892589

2590-
Show empty lists and fields in dump output.
2590+
Show empty lists and fields that are ``None``.
25912591

25922592
.. versionadded:: next
25932593

Lib/ast.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ def main():
645645
help='indentation of nodes (number of spaces)')
646646
parser.add_argument('--feature-version',
647647
type=str, default=None, metavar='VERSION',
648-
help='minor version (int) or 3.x tuple (e.g., 3.10)')
648+
help='python version in the format 3.x (e.g., 3.10)')
649649
parser.add_argument('-o', '--optimize',
650650
type=int, default=-1, metavar='LEVEL',
651651
help='optimization level for parser (default -1)')
@@ -664,13 +664,13 @@ def main():
664664
# Process feature_version
665665
feature_version = None
666666
if args.feature_version:
667-
if '.' in args.feature_version:
668-
major_minor = tuple(map(int, args.feature_version.split('.', 1)))
669-
if len(major_minor) != 2 or major_minor[0] != 3:
670-
parser.error("--feature-version must be 3.x tuple (e.g., 3.10)")
671-
feature_version = major_minor
672-
else:
673-
feature_version = int(args.feature_version)
667+
try:
668+
major, minor = map(int, args.feature_version.split('.', 1))
669+
except ValueError:
670+
parser.error('Invalid format for --feature-version; '
671+
'expected format 3.x (e.g., 3.10)')
672+
673+
feature_version = (major, minor)
674674

675675
tree = parse(source, name, args.mode, type_comments=args.no_type_comments,
676676
feature_version=feature_version, optimize=args.optimize)

0 commit comments

Comments
 (0)