Merge pull request #131 from twobraids/fix_command_line

make get_opt truly ignore unknown options

Author: twobraids

configman/tests/test_val_for_getopt.py

@@ -118,11 +118,11 @@ def test_for_getopt_with_ignore(self):
         args = ['-a', '14', '--fred', 'sally', 'ethel', 'dwight']
         o, a = function(args, '', [])
         self.assertEqual([], o)
-        self.assertEqual(a, args)
+        self.assertEqual(a, ['14', 'sally', 'ethel', 'dwight'])
         args = ['-a', '14', '--fred', 'sally', 'ethel', 'dwight']
         o, a = function(args, 'a:', [])
         self.assertEqual(o, [('-a', '14')])
-        self.assertEqual(a, ['--fred', 'sally', 'ethel', 'dwight'])
+        self.assertEqual(a, ['sally', 'ethel', 'dwight'])
         args = ['-a', '14', '--fred', 'sally', 'ethel', 'dwight']
         o, a = function(args, 'a', ['fred='])
         self.assertEqual(o, [('-a', ''), ('--fred', 'sally')])

configman/value_sources/for_getopt.py

@@ -217,19 +217,25 @@ def getopt_with_ignore(args, shortopts, longopts=[]):
             if args[0] == '--':
                 prog_args += args[1:]
                 break
-            if args[0][:2] == '--':
+            if args[0].startswith('--'):
                 try:
-                    opts, args = getopt.do_longs(opts, args[0][2:],
-                                                 longopts, args[1:])
+                    opts, args = getopt.do_longs(
+                        opts,
+                        args[0][2:],
+                        longopts,
+                        args[1:]
+                    )
                 except getopt.GetoptError:
-                    prog_args.append(args[0])
                     args = args[1:]
-            elif args[0][:1] == '-':
+            elif args[0][0] == '-':
                 try:
-                    opts, args = getopt.do_shorts(opts, args[0][1:], shortopts,
-                                                  args[1:])
+                    opts, args = getopt.do_shorts(
+                        opts,
+                        args[0][1:],
+                        shortopts,
+                        args[1:]
+                    )
                 except getopt.GetoptError:
-                    prog_args.append(args[0])
                     args = args[1:]
             else:
                 prog_args.append(args[0])