[gobject-introspection] docwriter: Format list types as if they are arrays
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] docwriter: Format list types as if they are arrays
- Date: Fri, 15 Feb 2013 04:38:40 +0000 (UTC)
commit 9c8a86bb6740a3ca10eb58797d09c657acb64d4b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Feb 14 22:15:30 2013 -0500
docwriter: Format list types as if they are arrays
Language bindings don't actually care
giscanner/docwriter.py | 4 ++--
.../Regress.AnnotationObject-list-signal.page | 2 +-
.../Regress.AnnotationObject.get_objects.page | 4 ++--
.../Regress.AnnotationObject.get_strings.page | 4 ++--
.../Regress.TestObj-list-old.page | 2 +-
.../Regress.TestObj-list.page | 2 +-
.../Regress.test_filename_return.page | 4 ++--
.../Regress.test_glist_container_return.page | 4 ++--
.../Regress.test_glist_everything_return.page | 4 ++--
.../Regress.test_glist_nothing_in.page | 4 ++--
.../Regress.test_glist_nothing_in2.page | 4 ++--
.../Regress.test_glist_nothing_return.page | 4 ++--
.../Regress.test_glist_nothing_return2.page | 4 ++--
.../Regress.test_glist_null_in.page | 4 ++--
.../Regress.test_gslist_container_return.page | 4 ++--
.../Regress.test_gslist_everything_return.page | 4 ++--
.../Regress.test_gslist_nothing_in.page | 4 ++--
.../Regress.test_gslist_nothing_in2.page | 4 ++--
.../Regress.test_gslist_nothing_return.page | 4 ++--
.../Regress.test_gslist_nothing_return2.page | 4 ++--
.../Regress.test_gslist_null_in.page | 4 ++--
.../Regress.AnnotationObject.get_objects.page | 4 ++--
.../Regress.AnnotationObject.get_strings.page | 4 ++--
.../Regress.TestObj-list-old.page | 2 +-
.../Regress.TestObj-list.page | 2 +-
.../Regress.test_filename_return.page | 4 ++--
.../Regress.test_glist_container_return.page | 4 ++--
.../Regress.test_glist_everything_return.page | 4 ++--
.../Regress.test_glist_nothing_in.page | 4 ++--
.../Regress.test_glist_nothing_in2.page | 4 ++--
.../Regress.test_glist_nothing_return.page | 4 ++--
.../Regress.test_glist_nothing_return2.page | 4 ++--
.../Regress.test_glist_null_in.page | 4 ++--
.../Regress.test_glist_null_out.page | 4 ++--
.../Regress.test_gslist_container_return.page | 4 ++--
.../Regress.test_gslist_everything_return.page | 4 ++--
.../Regress.test_gslist_nothing_in.page | 4 ++--
.../Regress.test_gslist_nothing_in2.page | 4 ++--
.../Regress.test_gslist_nothing_return.page | 4 ++--
.../Regress.test_gslist_nothing_return2.page | 4 ++--
.../Regress.test_gslist_null_in.page | 4 ++--
.../Regress.test_gslist_null_out.page | 4 ++--
42 files changed, 79 insertions(+), 79 deletions(-)
---
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 8a03aef..9d0d5b8 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -448,7 +448,7 @@ class DocFormatterPython(DocFormatter):
return fundamental_types.get(name, name)
def format_type(self, type_):
- if 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),
@@ -517,7 +517,7 @@ class DocFormatterGjs(DocFormatter):
return fundamental_types.get(name, name)
def format_type(self, type_):
- if 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),
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
index 35d0edd..b29e2a6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
@@ -14,7 +14,7 @@
<title>Regress.AnnotationObject::list-signal</title>
<synopsis><code mime="text/x-python">
-function callback(annotation_object, list:<list>, user_param1, ...):void;
+function callback(annotation_object, list:[String], user_param1, ...):void;
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
index 4db2b5f..7245a0b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
@@ -10,7 +10,7 @@
<link type="guide" xref="Regress.AnnotationObject" group="method"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[Regress.AnnotationObject]</api:type>
</api:returns>
<api:name>regress_annotation_object_get_objects</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>AnnotationObject.prototype.get_objects</title>
<synopsis><code mime="text/x-gjs">
-function get_objects():<list> {
+function get_objects():[Regress.AnnotationObject] {
// Gjs wrapper for regress_annotation_object_get_objects()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
index f12734f..2b9dde1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
@@ -10,7 +10,7 @@
<link type="guide" xref="Regress.AnnotationObject" group="method"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_annotation_object_get_strings</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>AnnotationObject.prototype.get_strings</title>
<synopsis><code mime="text/x-gjs">
-function get_strings():<list> {
+function get_strings():[String] {
// Gjs wrapper for regress_annotation_object_get_strings()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page
index fe82188..19331f3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page
@@ -14,7 +14,7 @@
<title>Regress.TestObj:list-old</title>
<synopsis><code mime="text/x-python">
-"list-old" <list> : Read / Write
+"list-old" [String] : Read / Write
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page
index 30d452d..93252b2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page
@@ -14,7 +14,7 @@
<title>Regress.TestObj:list</title>
<synopsis><code mime="text/x-python">
-"list" <list> : Read / Write
+"list" [String] : Read / Write
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
index 1b31653..7922381 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[filename]</api:type>
</api:returns>
<api:name>regress_test_filename_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_filename_return</title>
<synopsis><code mime="text/x-gjs">
-function test_filename_return():<list> {
+function test_filename_return():[filename] {
// Gjs wrapper for regress_test_filename_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
index f1c08c4..d35f72b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_glist_container_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_container_return</title>
<synopsis><code mime="text/x-gjs">
-function test_glist_container_return():<list> {
+function test_glist_container_return():[String] {
// Gjs wrapper for regress_test_glist_container_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
index d54c888..4989dd8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_glist_everything_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_everything_return</title>
<synopsis><code mime="text/x-gjs">
-function test_glist_everything_return():<list> {
+function test_glist_everything_return():[String] {
// Gjs wrapper for regress_test_glist_everything_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
index b041b94..9b13e1b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_glist_nothing_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_glist_nothing_in</title>
<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_in(in:<list>):void {
+function test_glist_nothing_in(in:[String]):void {
// Gjs wrapper for regress_test_glist_nothing_in()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
index c5a7d9b..8403760 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_glist_nothing_in2</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_glist_nothing_in2</title>
<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_in2(in:<list>):void {
+function test_glist_nothing_in2(in:[String]):void {
// Gjs wrapper for regress_test_glist_nothing_in2()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
index 2a0af9f..9ae9a95 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_glist_nothing_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_nothing_return</title>
<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_return():<list> {
+function test_glist_nothing_return():[String] {
// Gjs wrapper for regress_test_glist_nothing_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
index 4c2a63c..069f5b0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_glist_nothing_return2</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_nothing_return2</title>
<synopsis><code mime="text/x-gjs">
-function test_glist_nothing_return2():<list> {
+function test_glist_nothing_return2():[String] {
// Gjs wrapper for regress_test_glist_nothing_return2()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
index 4579c80..8426bbf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_glist_null_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_glist_null_in</title>
<synopsis><code mime="text/x-gjs">
-function test_glist_null_in(in:<list>):void {
+function test_glist_null_in(in:[String]):void {
// Gjs wrapper for regress_test_glist_null_in()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
index 14334e0..7dd60e3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_gslist_container_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_container_return</title>
<synopsis><code mime="text/x-gjs">
-function test_gslist_container_return():<list> {
+function test_gslist_container_return():[String] {
// Gjs wrapper for regress_test_gslist_container_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
index d974687..c65a349 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_gslist_everything_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_everything_return</title>
<synopsis><code mime="text/x-gjs">
-function test_gslist_everything_return():<list> {
+function test_gslist_everything_return():[String] {
// Gjs wrapper for regress_test_gslist_everything_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
index 9379cef..3c09413 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_gslist_nothing_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_gslist_nothing_in</title>
<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_in(in:<list>):void {
+function test_gslist_nothing_in(in:[String]):void {
// Gjs wrapper for regress_test_gslist_nothing_in()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
index 87607bc..5eb3aa3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_gslist_nothing_in2</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_gslist_nothing_in2</title>
<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_in2(in:<list>):void {
+function test_gslist_nothing_in2(in:[String]):void {
// Gjs wrapper for regress_test_gslist_nothing_in2()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
index 7963703..80f6f7e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_gslist_nothing_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_nothing_return</title>
<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_return():<list> {
+function test_gslist_nothing_return():[String] {
// Gjs wrapper for regress_test_gslist_nothing_return()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
index 761b7b6..3119bf0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
</api:returns>
<api:name>regress_test_gslist_nothing_return2</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_nothing_return2</title>
<synopsis><code mime="text/x-gjs">
-function test_gslist_nothing_return2():<list> {
+function test_gslist_nothing_return2():[String] {
// Gjs wrapper for regress_test_gslist_nothing_return2()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
index 928f1d3..3cc8d42 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_gslist_null_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[String]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_gslist_null_in</title>
<synopsis><code mime="text/x-gjs">
-function test_gslist_null_in(in:<list>):void {
+function test_gslist_null_in(in:[String]):void {
// Gjs wrapper for regress_test_gslist_null_in()
}
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
index 4b0b3a0..d288385 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
@@ -10,7 +10,7 @@
<link type="guide" xref="Regress.AnnotationObject" group="method"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[Regress.AnnotationObject]</api:type>
</api:returns>
<api:name>regress_annotation_object_get_objects</api:name>
<api:arg>
@@ -24,7 +24,7 @@
<synopsis><code mime="text/x-python">
@accepts(Regress.AnnotationObject)
- returns(<list>)
+ returns([Regress.AnnotationObject])
def get_objects(self):
# Python wrapper for regress_annotation_object_get_objects()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
index 818168b..6b5f439 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
@@ -10,7 +10,7 @@
<link type="guide" xref="Regress.AnnotationObject" group="method"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_annotation_object_get_strings</api:name>
<api:arg>
@@ -24,7 +24,7 @@
<synopsis><code mime="text/x-python">
@accepts(Regress.AnnotationObject)
- returns(<list>)
+ returns([unicode])
def get_strings(self):
# Python wrapper for regress_annotation_object_get_strings()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
index fe82188..70fe618 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
@@ -14,7 +14,7 @@
<title>Regress.TestObj:list-old</title>
<synopsis><code mime="text/x-python">
-"list-old" <list> : Read / Write
+"list-old" [unicode] : Read / Write
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
index 30d452d..b21f723 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
@@ -14,7 +14,7 @@
<title>Regress.TestObj:list</title>
<synopsis><code mime="text/x-python">
-"list" <list> : Read / Write
+"list" [unicode] : Read / Write
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
index 9b259bf..ccf1af1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[filename]</api:type>
</api:returns>
<api:name>regress_test_filename_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_filename_return</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([filename])
def test_filename_return():
# Python wrapper for regress_test_filename_return()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
index 6963fb4..16ae13a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_glist_container_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_container_return</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_glist_container_return():
# Python wrapper for regress_test_glist_container_return()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
index 7c1d231..44f09fd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_glist_everything_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_everything_return</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_glist_everything_return():
# Python wrapper for regress_test_glist_everything_return()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
index bb93930..1950b99 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_glist_nothing_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_glist_nothing_in</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_glist_nothing_in(in):
# Python wrapper for regress_test_glist_nothing_in()
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
index fa87b14..3a5d966 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_glist_nothing_in2</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_glist_nothing_in2</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_glist_nothing_in2(in):
# Python wrapper for regress_test_glist_nothing_in2()
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
index 926d5f5..1385402 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_glist_nothing_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_nothing_return</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_glist_nothing_return():
# Python wrapper for regress_test_glist_nothing_return()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
index b616387..3a78443 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_glist_nothing_return2</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_glist_nothing_return2</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_glist_nothing_return2():
# Python wrapper for regress_test_glist_nothing_return2()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
index 4da827e..6f1ce10 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_glist_null_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_glist_null_in</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_glist_null_in(in):
# Python wrapper for regress_test_glist_null_in()
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
index e96a965..1bc2c2d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_glist_null_out</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>out_list</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_glist_null_out</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_glist_null_out(out_list):
# Python wrapper for regress_test_glist_null_out()
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
index e7ab5c1..b328b0f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_gslist_container_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_container_return</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_gslist_container_return():
# Python wrapper for regress_test_gslist_container_return()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
index ea32632..749adc2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_gslist_everything_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_everything_return</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_gslist_everything_return():
# Python wrapper for regress_test_gslist_everything_return()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
index 1cbf247..86e240e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_gslist_nothing_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_gslist_nothing_in</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_gslist_nothing_in(in):
# Python wrapper for regress_test_gslist_nothing_in()
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
index 3325a41..8edd87e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_gslist_nothing_in2</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_gslist_nothing_in2</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_gslist_nothing_in2(in):
# Python wrapper for regress_test_gslist_nothing_in2()
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
index 0a4a5aa..a6af8a2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_gslist_nothing_return</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_nothing_return</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_gslist_nothing_return():
# Python wrapper for regress_test_gslist_nothing_return()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
index 4fb5489..146643c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
@@ -10,7 +10,7 @@
<link type="guide" xref="index" group="function"/>
<api:function>
<api:returns>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
</api:returns>
<api:name>regress_test_gslist_nothing_return2</api:name>
</api:function>
@@ -19,7 +19,7 @@
<title>test_gslist_nothing_return2</title>
<synopsis><code mime="text/x-python">
- returns(<list>)
+ returns([unicode])
def test_gslist_nothing_return2():
# Python wrapper for regress_test_gslist_nothing_return2()
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
index 470a6ff..b3117c0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_gslist_null_in</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>in</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_gslist_null_in</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_gslist_null_in(in):
# Python wrapper for regress_test_gslist_null_in()
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
index 6c2dd5b..3a0fa92 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
@@ -14,7 +14,7 @@
</api:returns>
<api:name>regress_test_gslist_null_out</api:name>
<api:arg>
- <api:type><list></api:type>
+ <api:type>[unicode]</api:type>
<api:name>out_list</api:name>
</api:arg>
</api:function>
@@ -23,7 +23,7 @@
<title>test_gslist_null_out</title>
<synopsis><code mime="text/x-python">
- accepts(<list>)
+ accepts([unicode])
@returns(none)
def test_gslist_null_out(out_list):
# Python wrapper for regress_test_gslist_null_out()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
