summaryrefslogtreecommitdiff
path: root/giscanner/docwriter.py
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2020-04-28 11:18:18 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2020-04-28 11:19:29 +0200
commitbb364bd25d50215b0c40d98ba5ecf2aa779e53a2 (patch)
tree1618dbab70c70a86d6bf85e63252759fbd662732 /giscanner/docwriter.py
parent770d81f2a32a7bbaa64cd923a69838574e2f0454 (diff)
downloadgobject-introspection-bb364bd25d50215b0c40d98ba5ecf2aa779e53a2.tar.gz
Revert "Add support for element-type to GListModel"
Breaks vapigen and changes GListModel definition in Gio-2.0.gir This reverts commit a9f45431684e6be3623e272e54d481e4c5d9423d.
Diffstat (limited to 'giscanner/docwriter.py')
-rw-r--r--giscanner/docwriter.py18
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),