Bug 378704 – OptionParser.parse_args() returns unexpected results Patch

2008-07-14  Johan Dahlin  <johan@gnome.org>

        Bug 378704 – OptionParser.parse_args() returns unexpected results       
        * gobject/option.py:
        Patch by Johannes Hölzl


svn path=/trunk/; revision=804

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2433c5b9..12421c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-07-14  Johan Dahlin  <johan@gnome.org>
 
+	Bug 378704 – OptionParser.parse_args() returns unexpected results
+
+	* gobject/option.py:
+	Patch by Johannes Hölzl
+
+2008-07-14  Johan Dahlin  <johan@gnome.org>
+
 	Bug 491773 – autoconf failure: .m4 files cannot be found
 
 	* Makefile.am:
diff --git a/gobject/option.py b/gobject/option.py
index f348b991..bab1be92 100644
--- a/gobject/option.py
+++ b/gobject/option.py
@@ -313,7 +313,11 @@ class OptionParser(optparse.OptionParser):
 
     def _process_args(self, largs, rargs, values):
         context = self._to_goptioncontext(values)
-        largs.extend(context.parse([sys.argv[0]] + rargs))
+        
+        # _process_args() returns the remaining parameters in rargs.
+        # The prepended program name is used to all g_set_prgname()
+        # The program name is cut away so it doesn't appear in the result.
+        rargs[:] = context.parse([sys.argv[0]] + rargs)[1:]
 
     def parse_args(self, args=None, values=None):
         old_args = args or []