diff options
| author | Johan Dahlin <johan@gnome.org> | 2007-11-12 21:58:15 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2007-11-12 21:58:15 +0000 |
| commit | 555c368ad1f9e29dc15a018f795312d8b6a7fa0e (patch) | |
| tree | 8bc59c3b9bbbbabee25f6c30f5bbca14c94bd4f4 | |
| parent | 825d8de9a85f60a4d747e5cf4531c0ac761cfa13 (diff) | |
| download | pygobject-555c368ad1f9e29dc15a018f795312d8b6a7fa0e.tar.gz | |
Set the default value of old_args to 0, so we don't end up slicing with
2007-11-12 Johan Dahlin <johan@gnome.org>
* gobject/option.py (OptionParser.parse_args):
Set the default value of old_args to 0, so we don't end
up slicing with None. Fixes #496278 (Vincent Untz)
svn path=/trunk/; revision=718
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gobject/option.py | 2 | ||||
| -rw-r--r-- | tests/test_option.py | 3 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2007-11-12 Johan Dahlin <johan@gnome.org> + + * gobject/option.py (OptionParser.parse_args): + Set the default value of old_args to 0, so we don't end + up slicing with None. Fixes #496278 (Vincent Untz) + 2007-11-06 Johan Dahlin <johan@gnome.org> * gobject/option.py (OptionParser.parse_args): Merge in values diff --git a/gobject/option.py b/gobject/option.py index 5930274c..91424c9d 100644 --- a/gobject/option.py +++ b/gobject/option.py @@ -316,7 +316,7 @@ class OptionParser(optparse.OptionParser): largs.extend(context.parse([sys.argv[0]] + rargs)) def parse_args(self, args=None, values=None): - old_args = args + old_args = args or 0 try: options, args = optparse.OptionParser.parse_args( self, args, values) diff --git a/tests/test_option.py b/tests/test_option.py index 23015531..69e17662 100644 --- a/tests/test_option.py +++ b/tests/test_option.py @@ -65,6 +65,9 @@ class TestOption(unittest.TestCase): ["test_option.py", "--", "-xxx"]) #self.assertEquals(args, ["-xxx"]) + def testParseArgs(self): + options, args = self.parser.parse_args() + def testParseArgsGroup(self): group = self._create_group() |