diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-04-26 13:11:15 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-04-26 13:11:15 +0100 |
| commit | 6dc8402c267a5855219b77be2d649f3a9e84d817 (patch) | |
| tree | 752f3d361ba29017d796cd1713db4dc0d2f7995d /giscanner | |
| parent | f9d53d9d0020d2a13ca246e19c5ce2e180e5b78a (diff) | |
| download | gobject-introspection-6dc8402c267a5855219b77be2d649f3a9e84d817.tar.gz | |
Revert "Generate appropriate docs for ListModel with element-type"
This reverts commit ffe3e435e0b7943a0872034223b5f6ea02258ffa.
See: #336
Diffstat (limited to 'giscanner')
| -rw-r--r-- | giscanner/docwriter.py | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index e4a8f7c5..786da80d 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -793,11 +793,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase): return fundamental_types.get(name, name) def format_type(self, type_, link=False): - if isinstance(type_, ast.List): - if type_.name == 'Gio.ListModel': - return 'Gio.ListModel(item_type=' + self.format_type(type_.element_type) + ')' - return '[' + self.format_type(type_.element_type) + ']' - elif isinstance(type_, ast.Array): + if isinstance(type_, (ast.List, ast.Array)): return '[' + self.format_type(type_.element_type) + ']' elif isinstance(type_, ast.Map): return '{%s: %s}' % (self.format_type(type_.key_type), @@ -934,14 +930,10 @@ class DocFormatterGjs(DocFormatterIntrospectableBase): return fundamental_types.get(name, name) def format_type(self, type_, link=False): - if isinstance(type_, ast.Array): - if type_.element_type.target_fundamental in ('gint8', 'guint8'): - return 'ByteArray' - else: - return 'Array(' + self.format_type(type_.element_type, link) + ')' - elif isinstance(type_, ast.List): - if type_.name == 'Gio.ListModel': - return 'Gio.ListModel({item_type: ' + self.format_type(type_.element_type) + '})' + if isinstance(type_, ast.Array) and \ + type_.element_type.target_fundamental in ('gint8', 'guint8'): + return 'ByteArray' + elif isinstance(type_, (ast.List, ast.Array)): return 'Array(' + self.format_type(type_.element_type, link) + ')' elif isinstance(type_, ast.Map): return '{%s: %s}' % (self.format_type(type_.key_type, link), |