From c3e35b9260b796bb16fab3d13b4ae6ad78185a0d Mon Sep 17 00:00:00 2001 From: Merlijn Wajer Date: Fri, 10 May 2013 11:13:07 +0200 Subject: [PATCH] Fix optparse code. Small difference from argparse. ;-) --- py/create.py | 7 +++---- py/read.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/py/create.py b/py/create.py index 147f484..2d067cb 100644 --- a/py/create.py +++ b/py/create.py @@ -23,7 +23,7 @@ parser.add_option('-c', '--config', type=str, action='append', parser.add_option('-C', '--compat', action='store_true', help='Enable compatibility mode; for Python < 2.7') -args = parser.parse_args() +args, _ = parser.parse_args() # Unpickle from stdin ; currently this is the default and only way f = pickle.Unpickler(sys.stdin) @@ -31,9 +31,8 @@ f = pickle.Unpickler(sys.stdin) conf = f.load() for path in args.config: - if path: - config = imp.load_source('', path).config - conf.update(config) + config = imp.load_source('', path).config + conf.update(config) m = KeyMapper(conf) diff --git a/py/read.py b/py/read.py index 10b7e00..bff8121 100644 --- a/py/read.py +++ b/py/read.py @@ -21,7 +21,7 @@ parser.add_option('-i', '--input-file', action='append', parser.add_option('-C', '--compat', action='store_true', help='Enable compatibility mode; for Python < 2.7') -args = parser.parse_args() +args, _ = parser.parse_args() if len(args.input_file) == 0: