codegen/: Updated codegenerator to current pygtk one.

Original commit message from CVS:
* codegen/Makefile.am:
* codegen/argtypes.py:
* codegen/codegen.py:
* codegen/definitions.py:
* codegen/defsconvert.py:
* codegen/defsparser.py:
* codegen/docextract.py:
* codegen/docextract_to_xml.py:
* codegen/docgen.py:
* codegen/h2def.py:
* codegen/mergedefs.py:
* codegen/missingdefs.py:
* codegen/mkskel.py:
* codegen/override.py:
* codegen/reversewrapper.py:
Updated codegenerator to current pygtk one.
* gst/gst.defs:
* gst/gst.override:
* gst/gstpad.override:
Update defs for new constructor definition.
* testsuite/test_bin.py:
With new constructors, pygobject will try to convert the argument to the
proper GType (here a string).

1 files changed, 4 insertions, 3 deletions

diff --git a/codegen/mergedefs.py b/codegen/mergedefs.py
index 3e92f9c..773e499 100755
--- a/codegen/mergedefs.py
+++ b/codegen/mergedefs.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # -*- Mode: Python; py-indent-offset: 4 -*-
 
-import sys
+import optparse
+
 import defsparser
-from optparse import OptionParser
 
-parser = OptionParser(usage="usage: %prog [options] generated-defs old-defs")
+parser = optparse.OptionParser(
+    usage="usage: %prog [options] generated-defs old-defs")
 parser.add_option("-p", "--merge-parameters",
                   help="Merge changes in function/methods parameter lists",
                   action="store_true", dest="parmerge", default=False)