Skip to content

Commit b74e050

Browse files
kyclarkkyclark
committed
reorg
1 parent fa9baa2 commit b74e050

15 files changed

Lines changed: 20 additions & 67 deletions

getting_started/cat_n.py renamed to hello/cat_n.py

File renamed without changes.

getting_started/choices.py renamed to hello/choices.py

File renamed without changes.

‎hello/hello.py‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,23 @@
11
#!/usr/bin/env python3
2-
"""
3-
Purpose: Say hello
4-
Author: Ken Youens-Clark
5-
"""
2+
# Purpose: Say hello
63

74
import argparse
85

9-
10-
# --------------------------------------------------
116
def get_args() -> argparse.Namespace:
12-
"""Get command-line arguments"""
13-
14-
parser = argparse.ArgumentParser(
15-
description='Say hello',
16-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
17-
18-
parser.add_argument('-n', # short option name
19-
'--name', # long option name
20-
default='World', # default value
21-
metavar='str', # data type
22-
help='The name to greet')
23-
7+
parser = argparse.ArgumentParser(description='Say hello')
8+
parser.add_argument('name', metavar='str', help='The name to greet')
249
return parser.parse_args()
2510

26-
27-
# --------------------------------------------------
2811
def main() -> None:
29-
"""Start here"""
30-
3112
args = get_args()
3213
print(greet(args.name))
3314

34-
35-
# --------------------------------------------------
3615
def greet(name: str) -> str:
37-
"""Create a greeting"""
38-
3916
return f'Hello, {name}!'
4017

41-
42-
# --------------------------------------------------
4318
def test_greet() -> None:
44-
"""Test greet"""
45-
4619
assert greet('World') == 'Hello, World!'
4720
assert greet('Terra Firma') == 'Hello, Terra Firma!'
4821

49-
50-
# --------------------------------------------------
5122
if __name__ == '__main__':
5223
main()

‎hello/hello11.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,9 @@ def test_greet() -> None:
1111
assert greet('Terra Firma') == 'Hello, Terra Firma!'
1212

1313
def main() -> None:
14-
# create argument parser
15-
parser = argparse.ArgumentParser(
16-
description='Say hello',
17-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
18-
19-
# add "name" parameter
14+
parser = argparse.ArgumentParser(description='Say hello')
2015
parser.add_argument('name', help='Name to greet')
21-
22-
# get the parsed arguments
2316
args = parser.parse_args()
24-
25-
# greet the "name" value inside "args"
2617
print(greet(args.name))
2718

2819
if __name__ == '__main__':

‎hello/hello12.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33

44
import argparse
55

6-
def get_args() -> argparse.Namespace: # function to get arguments
7-
parser = argparse.ArgumentParser(
8-
description='Say hello',
9-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
10-
6+
def get_args() -> argparse.Namespace:
7+
parser = argparse.ArgumentParser(description='Say hello')
118
parser.add_argument('name', metavar='str', help='The name to greet')
129
return parser.parse_args()
1310

1411
def main() -> None:
15-
args = get_args() # call "get_args"
12+
args = get_args()
1613
print(greet(args.name))
1714

1815
def greet(name: str) -> str:

‎hello/hello13.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
def get_args() -> argparse.Namespace:
1212
"""Get command-line arguments"""
1313

14-
parser = argparse.ArgumentParser(
15-
description='Say hello',
16-
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
17-
14+
parser = argparse.ArgumentParser(description='Say hello')
1815
parser.add_argument('name', metavar='str', help='The name to greet')
1916
return parser.parse_args()
2017

‎hello/hello14.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ def get_args() -> argparse.Namespace:
1515
description='Say hello',
1616
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
1717

18-
parser.add_argument('-n', # short option name
19-
'--name', # long option name
20-
default='World', # default value
21-
metavar='str', # data type
18+
parser.add_argument('-n',
19+
'--name',
20+
default='World',
21+
metavar='str',
2222
help='The name to greet')
2323

2424
return parser.parse_args()

getting_started/nargs+.py renamed to hello/nargs+.py

File renamed without changes.

getting_started/nargs2.py renamed to hello/nargs2.py

File renamed without changes.

getting_started/one_arg.py renamed to hello/one_arg.py

File renamed without changes.

0 commit comments

Comments
 (0)