Skip to content

Fix main for Python2 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexanderWells-diamond merged 2 commits into from
Nov 25, 2021
Merged

Fix main for Python2 #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4e3f2f
Fix main for Python2
AlexanderWells-diamond Nov 24, 2021
5c39790
Make script optional+pass everything to subprocess
AlexanderWells-diamond Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions softioc/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
from argparse import ArgumentParser
import subprocess

from softioc import __version__
from . import __version__


def main(args=None):
parser = ArgumentParser()
parser.add_argument("--version", action="version", version=__version__)
parser.add_argument("script", help="The python script to run")
parser.add_argument(
"script", help="The python script to run", nargs="?", default=None)
parser.add_argument(
"arg", help="Any arguments to pass to the script", nargs="*")
parsed_args = parser.parse_args(args)
# Execute as subprocess
cmd = [sys.executable, parsed_args.script, *parsed_args.arg]
parsed_args, unknown = parser.parse_known_args(args)

# Execute as subprocess.
cmd = [sys.executable] + parsed_args.arg + unknown
if parsed_args.script:
cmd.insert(1, parsed_args.script)

subprocess.Popen(cmd).communicate()


Expand Down