diff options
| author | Laszlo Pandy <lpandy@src.gnome.org> | 2011-08-11 10:21:41 +0200 |
|---|---|---|
| committer | Laszlo Pandy <lpandy@src.gnome.org> | 2011-08-11 10:29:23 +0200 |
| commit | ee49a56ab6febafe075daeecddf2cc2b36dcf2e2 (patch) | |
| tree | e891fb944e69164790bed0e9fc22ea6789d65a6b | |
| parent | 6a0a3f54db9a20cad02e954355cfb93ded1eb4dd (diff) | |
| download | gobject-introspection-ee49a56ab6febafe075daeecddf2cc2b36dcf2e2.tar.gz | |
[docbook] fix exception when there is no ctype.
| -rw-r--r-- | giscanner/docbookwriter.py | 6 | ||||
| -rw-r--r-- | giscanner/docmain.py | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/giscanner/docbookwriter.py b/giscanner/docbookwriter.py index 2ff8cdf2..2056c42b 100644 --- a/giscanner/docbookwriter.py +++ b/giscanner/docbookwriter.py @@ -86,7 +86,11 @@ class DocBookFormatter(object): self._writer.disable_whitespace() retval_type = method.retval.type - link_dest = retval_type.ctype.replace("*", "") + if retval_type.ctype: + link_dest = retval_type.ctype.replace("*", "") + else: + link_dest = str(retval_type) + if retval_type.target_giname: ns = retval_type.target_giname.split('.') if ns[0] == self._namespace.name: diff --git a/giscanner/docmain.py b/giscanner/docmain.py index 8e54d7ad..7684944b 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -34,9 +34,8 @@ class GIDocGenerator(object): writer.add_namespace(ns) writer.write(output) - def doc_main(args): - parser = optparse.OptionParser('%prog [options] sources') + parser = optparse.OptionParser('%prog [options] GIR-file') parser.add_option("-o", "--output", action="store", dest="output", @@ -51,7 +50,7 @@ def doc_main(args): raise SystemExit("missing output parameter") if len(args) < 2: - raise SystemExit("Need an input gir filename") + raise SystemExit("Need an input GIR filename") if options.format == "docbook": writer = DocBookWriter() |