docwriter: Format list types as if they are arrays

Language bindings don't actually care

42 files changed, 79 insertions, 79 deletions

diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 8a03aefe..9d0d5b8f 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 35d0edd1..b29e2a6a 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 4db2b5f1..7245a0b6 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>&lt;list&gt;</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 f12734f1..2b9dde17 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>&lt;list&gt;</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 fe821889..19331f31 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 30d452db..93252b2b 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 1b316534..7922381c 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>&lt;list&gt;</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 f1c08c40..d35f72b9 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>&lt;list&gt;</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 d54c8884..4989dd86 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>&lt;list&gt;</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 b041b94d..9b13e1b3 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>&lt;list&gt;</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 c5a7d9b3..84037606 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>&lt;list&gt;</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 2a0af9f9..9ae9a958 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>&lt;list&gt;</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 4c2a63cd..069f5b0b 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>&lt;list&gt;</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 4579c800..8426bbff 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>&lt;list&gt;</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 14334e03..7dd60e37 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>&lt;list&gt;</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 d9746870..c65a3490 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>&lt;list&gt;</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 9379cef6..3c09413a 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>&lt;list&gt;</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 87607bc7..5eb3aa3f 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>&lt;list&gt;</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 79637032..80f6f7e2 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>&lt;list&gt;</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 761b7b67..3119bf03 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>&lt;list&gt;</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 928f1d30..3cc8d428 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>&lt;list&gt;</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 4b0b3a05..d2883854 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 818168ba..6b5f4391 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 fe821889..70fe6185 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 30d452db..b21f7238 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 9b259bfd..ccf1af1d 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 6963fb41..16ae13ab 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 7c1d2313..44f09fdd 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 bb93930b..1950b99a 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>&lt;list&gt;</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 fa87b14c..3a5d966d 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>&lt;list&gt;</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 926d5f5f..13854024 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 b6163879..3a78443f 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 4da827e9..6f1ce10d 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>&lt;list&gt;</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 e96a9652..1bc2c2de 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>&lt;list&gt;</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 e7ab5c11..b328b0f0 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 ea32632f..749adc28 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 1cbf247c..86e240eb 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>&lt;list&gt;</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 3325a41a..8edd87e2 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>&lt;list&gt;</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 0a4a5aaa..a6af8a2a 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 4fb5489f..146643c6 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>&lt;list&gt;</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(&lt;list&gt;)
+@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 470a6fff..b3117c01 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>&lt;list&gt;</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 6c2dd5b4..3a0fa92e 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>&lt;list&gt;</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()