diff options
| author | Johan Dahlin <zilch@src.gnome.org> | 2004-03-02 12:46:38 +0000 |
|---|---|---|
| committer | Johan Dahlin <zilch@src.gnome.org> | 2004-03-02 12:46:38 +0000 |
| commit | 9b67d44fbd6bda2811b76a622e229aa20e26f390 (patch) | |
| tree | b23bdc226174718d7b2da66ac0de162978be2a55 | |
| parent | 24330570746ab3ce1add62b54022a36937c4996d (diff) | |
| download | pygtk-9b67d44fbd6bda2811b76a622e229aa20e26f390.tar.gz | |
Fix a typo and remove module prefix from manually defined functions/methods
| -rw-r--r-- | codegen/codegen.py | 16 | ||||
| -rw-r--r-- | codegen/override.py | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/codegen/codegen.py b/codegen/codegen.py index c59b24c6..aa7482d7 100644 --- a/codegen/codegen.py +++ b/codegen/codegen.py @@ -67,9 +67,9 @@ class Wrapper: ' (setattrfunc)%(tp_setattr)s, /* tp_setattr */\n' \ ' (cmpfunc)%(tp_compare)s, /* tp_compare */\n' \ ' (reprfunc)%(tp_repr)s, /* tp_repr */\n' \ - ' %(tp_as_number)s, /* tp_as_number */\n' \ - ' %(tp_as_sequence)s, /* tp_as_sequence */\n' \ - ' %(tp_as_mapping)s, /* tp_as_mapping */\n' \ + ' (PyNumberMethods*)%(tp_as_number)s, /* tp_as_number */\n' \ + ' (PySequenceMethods*)%(tp_as_sequence)s, /* tp_as_sequence */\n' \ + ' (PyMappingMethods*)%(tp_as_mapping)s, /* tp_as_mapping */\n' \ ' (hashfunc)%(tp_hash)s, /* tp_hash */\n' \ ' (ternaryfunc)%(tp_call)s, /* tp_call */\n' \ ' (reprfunc)%(tp_str)s, /* tp_str */\n' \ @@ -478,13 +478,13 @@ class Wrapper: elif self.overrides.wants_noargs(func): methflags = 'METH_NOARGS' - functions.append(self.methdef_tmpl % - { 'name': func.split('_', 1)[1], - 'cname': '_wrap_' + func, - 'flags': methflags }) + functions.append(self.methdef_tmpl % + { 'name': func, + 'cname': '_wrap_' + func, + 'flags': methflags }) except: sys.stderr.write('Could not write function %s: %s\n' - % (fun, exc_info())) + % (func, exc_info())) # write the PyMethodDef structure functions.append(' { NULL, NULL, 0 }\n') diff --git a/codegen/override.py b/codegen/override.py index 56f0f306..da84c388 100644 --- a/codegen/override.py +++ b/codegen/override.py @@ -152,7 +152,6 @@ class Overrides: self.defines[klass] = {} self.defines[klass][func] = rest else: - func = self.modulename + '_' + func self.functions[func] = rest if 'kwargs' in words[1:]: |