Skip to content

Commit c451ea4

Browse files
author
Matthias Koeppe
committed
pkgs/sage-conf: Make 'python3 -m sage_conf' work like 'sage-config'
1 parent acbe15d commit c451ea4

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

pkgs/sage-conf/_sage_conf/__main__.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
# Entry point 'sage-config'. It does not depend on any packages.
22

3-
from sage_conf import *
4-
53
def _main():
64
from argparse import ArgumentParser
75
from sys import exit, stdout
8-
parser = ArgumentParser()
6+
7+
import sage_conf
8+
9+
parser = ArgumentParser(prog='sage-config')
910
parser.add_argument('--version', help="show version", action="version",
10-
version='%(prog)s ' + VERSION)
11+
version='%(prog)s ' + sage_conf.VERSION)
1112
parser.add_argument("VARIABLE", nargs='?', help="output the value of VARIABLE")
1213
args = parser.parse_args()
13-
d = globals()
1414
if args.VARIABLE:
15-
stdout.write('{}\n'.format(d[args.VARIABLE]))
15+
stdout.write('{}\n'.format(getattr(sage_conf, args.VARIABLE)))
1616
else:
17-
for k, v in d.items():
17+
for k in dir(sage_conf):
1818
if not k.startswith('_'):
19-
stdout.write('{}={}\n'.format(k, v))
20-
21-
if __name__ == "__main__":
22-
_main()
19+
stdout.write('{}={}\n'.format(k, getattr(sage_conf, k)))

pkgs/sage-conf/sage_conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
from _sage_conf._conf import *
22
from _sage_conf.__main__ import _main
3+
4+
5+
if __name__ == "__main__":
6+
_main()

0 commit comments

Comments
 (0)