From f1448162568ef8fba266aeae286f7bce24ee97e6 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Tue, 20 Aug 2013 13:14:45 +0200 Subject: [PATCH] solaar-cli: fix argument parsing in Python 3 again Fix from e3a887f36cc6ec7ddb3760d31b47dacb6931a7eb, this got removed in: commit 3b75b6997008a6e0479cd324cc18ae0d79b279af Author: Daniel Pavel Date: Fri Aug 9 12:25:47 2013 +0200 merged solaar-cli functionality into main solaar binary --- lib/solaar/cli/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/solaar/cli/__init__.py b/lib/solaar/cli/__init__.py index 1d2d25f5..6c386e2a 100644 --- a/lib/solaar/cli/__init__.py +++ b/lib/solaar/cli/__init__.py @@ -136,6 +136,12 @@ def run(cli_args=None): args = _cli_parser.parse_args(cli_args) else: args = _cli_parser.parse_args() + # Python 3 has an undocumented 'feature' that breaks parsing empty args + # http://bugs.python.org/issue16308 + if not 'cmd' in args: + _cli_parser.print_usage(_sys.stderr) + _sys.stderr.write('%s: error: too few arguments\n' % NAME.lower()) + _sys.exit(2) action = args.action assert action in actions