diff options
Diffstat (limited to 'scripts/remote/main.py')
| -rw-r--r-- | scripts/remote/main.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/remote/main.py b/scripts/remote/main.py index cef5d92ee2..5aa176fdc4 100644 --- a/scripts/remote/main.py +++ b/scripts/remote/main.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function @@ -7,7 +7,7 @@ import os import argparse import binascii import logging -from Queue import Queue +from queue import Queue from .ratp import RatpError try: @@ -48,7 +48,7 @@ def get_controller(args): def handle_run(args): ctrl = get_controller(args) - ctrl.export(args.export) + ctrl.export(args.export.encode()) res = ctrl.command(' '.join(args.arg)) if res: res = 1 @@ -160,10 +160,10 @@ def handle_listen(args): def handle_console(args): queue = Queue() ctrl = get_controller(args) - ctrl.export(args.export) + ctrl.export(args.export.encode()) ctrl.start(queue) - ctrl.send_async_console('\r') - cons = ConsoleInput(queue, exit='\x14') # CTRL-T + ctrl.send_async_console(b'\r') + cons = ConsoleInput(queue, exit=b'\x14') # CTRL-T cons.start() try: while True: @@ -206,6 +206,7 @@ parser.add_argument('--port', type=str, default=os.environ.get('BBREMOTE_PORT', parser.add_argument('--baudrate', type=int, default=os.environ.get('BBREMOTE_BAUDRATE', 115200)) parser.add_argument('--export', type=str, default=os.environ.get('BBREMOTE_EXPORT', None)) parser.add_argument('-w', '--wait', action='count', default=0) +parser.set_defaults(func=None) subparsers = parser.add_subparsers(help='sub-command help') parser_run = subparsers.add_parser('run', help="run a barebox command") @@ -277,6 +278,11 @@ parser_console.set_defaults(func=handle_console) args = parser.parse_args() logging.basicConfig(level=VERBOSITY[args.verbose], format='%(levelname)-8s %(module)-8s %(funcName)-16s %(message)s') + +if args.func is None: + parser.print_help() + exit(1) + try: res = args.func(args) exit(res) |