g-ir-doc-tool: Use None instead of %NULL

45 files changed, 64 insertions, 58 deletions

diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index 67e93443..2fa38176 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/mallardwriter.py
@@ -96,6 +96,12 @@ class MallardFormatterPython(MallardFormatter):
         else:
             return type_.target_fundamental
 
+    @classmethod
+    def format(cls, doc):
+        doc = MallardFormatter.format(doc)
+        doc = doc.replace('%NULL', 'None')
+        return doc
+
 class MallardWriter(object):
     def __init__(self, transformer, language):
         if language not in ["Python", "C"]:
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page
index 1033629a..a581412f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page
@@ -34,7 +34,7 @@ def GIRepository.BaseInfo.get_attribute(name)
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>The value of the attribute, or %NULL if no such attribute exists</p></td>
+<td><p>The value of the attribute, or None if no such attribute exists</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
index 4201a10d..b5219289 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
@@ -27,7 +27,7 @@ the name of the function.</p>
 <table>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the name of @info or %NULL if it lacks a name.</p></td>
+<td><p>the name of @info or None if it lacks a name.</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
index 572c9569..02dadcad 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
@@ -35,7 +35,7 @@ def GIRepository.BaseInfo.iterate_attributes(iterator, name, value)
 </code></synopsis>
 <p>Iterate over all attributes associated with this node.  The iterator
 structure is typically stack allocated, and must have its first
-member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
+member initialized to None.</p><p>Both the @name and @value should be treated as constants
 and must not be freed.</p><p>&lt;example&gt;
 &lt;title&gt;Iterating over attributes&lt;/title&gt;
 &lt;programlisting&gt;
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
index c5b0d49f..3acadafc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
@@ -32,7 +32,7 @@ def GIRepository.Repository.find_by_error_domain(domain)
 <p>Searches for the enum type corresponding to the given <link xref="GError">GError</link>
 domain. Before calling this function for a particular namespace,
 you must call g_irepository_require() once to load the namespace, or
-otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NULL</p>
+otherwise ensure the namespace has already been loaded.</p><p>enum type, or None</p>
 
 <table>
 <tr>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
index 200167fa..8369ef2b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
@@ -43,7 +43,7 @@ when you know the GType to originate from be from a loaded namespace.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @type, or %NULL</p></td>
+<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @type, or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
index bf8c9940..6216c159 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
@@ -49,7 +49,7 @@ ensure the namespace has already been loaded.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @name, or %NULL</p></td>
+<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @name, or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page
index c7640576..58565eb9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page
@@ -41,7 +41,7 @@ such as g_irepository_require() before calling this function.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>C namespace prefix, or %NULL if none associated</p></td>
+<td><p>C namespace prefix, or None if none associated</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
index 9d6467d4..765119d6 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
@@ -26,7 +26,7 @@ particular process, but this function is provided in the unlikely
 eventuality that it would become possible, and as a convenience for
 higher level language bindings to conform to the GObject method
 call conventions.
-All methods on <link xref="GIRepository">GIRepository</link> also accept %NULL as an instance
+All methods on <link xref="GIRepository">GIRepository</link> also accept None as an instance
 parameter to mean this default repository, which is usually more
 convenient for C.</p>
 
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page
index 06488c49..fcd43590 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page
@@ -32,7 +32,7 @@ def GIRepository.Repository.get_shared_library(namespace_)
 <p>This function returns the full path to the shared C library
 associated with the given namespace @namespace_. There may be no
 shared library path associated, in which case this function will
-return %NULL.</p><p>Note: The namespace must have already been loaded using a function
+return None.</p><p>Note: The namespace must have already been loaded using a function
 such as g_irepository_require() before calling this function.</p>
 
 <table>
@@ -42,7 +42,7 @@ such as g_irepository_require() before calling this function.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>Full path to shared library, or %NULL if none associated</p></td>
+<td><p>Full path to shared library, or None if none associated</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page
index 055b626a..a8727ac7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page
@@ -41,7 +41,7 @@ the special string "$lt;builtin$gt;".</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>Filesystem path (or $lt;builtin$gt;) if successful, %NULL if namespace is not loaded</p></td>
+<td><p>Filesystem path (or $lt;builtin$gt;) if successful, None if namespace is not loaded</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page
index 962ddb21..6785df40 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page
@@ -47,7 +47,7 @@ quickly as this function will if it has already been loaded.</p>
 </tr>
 <tr>
 <td><p>version :</p></td>
-<td><p>Required version, may be %NULL for latest</p></td>
+<td><p>Required version, may be None for latest</p></td>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
index c921d23c..f678498b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
@@ -50,7 +50,7 @@ not specified, the latest will be used.</p>
 </tr>
 <tr>
 <td><p>version :</p></td>
-<td><p>Version of namespace, may be %NULL for latest</p></td>
+<td><p>Version of namespace, may be None for latest</p></td>
 </tr>
 <tr>
 <td><p>flags :</p></td>
@@ -58,7 +58,7 @@ not specified, the latest will be used.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, %NULL otherwise</p></td>
+<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, None otherwise</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
index d52fb7a8..59925737 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
@@ -58,7 +58,7 @@ not specified, the latest will be used.</p>
 </tr>
 <tr>
 <td><p>version :</p></td>
-<td><p>Version of namespace, may be %NULL for latest</p></td>
+<td><p>Version of namespace, may be None for latest</p></td>
 </tr>
 <tr>
 <td><p>flags :</p></td>
@@ -66,7 +66,7 @@ not specified, the latest will be used.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, %NULL otherwise</p></td>
+<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, None otherwise</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
index 229bcea2..2d7afcc4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
@@ -25,7 +25,7 @@
 @returns(gboolean)
 def arg_info_may_be_null(info)
 </code></synopsis>
-<p>Obtain if the argument accepts %NULL.</p>
+<p>Obtain if the argument accepts None.</p>
 
 <table>
 <tr>
@@ -34,7 +34,7 @@ def arg_info_may_be_null(info)
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>%TRUE if it accepts %NULL</p></td>
+<td><p>%TRUE if it accepts None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
index 1eed21ef..e7515e4c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
@@ -42,7 +42,7 @@ def callable_info_get_return_attribute(info, name)
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>The value of the attribute, or %NULL if no such attribute exists</p></td>
+<td><p>The value of the attribute, or None if no such attribute exists</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
index 0465b630..a33fdb24 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
@@ -39,7 +39,7 @@ def callable_info_iterate_return_attributes(info, iterator, name, value)
 </code></synopsis>
 <p>Iterate over all attributes associated with the return value.  The
 iterator structure is typically stack allocated, and must have its
-first member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
+first member initialized to None.</p><p>Both the @name and @value should be treated as constants
 and must not be freed.</p><p>See g_base_info_iterate_attributes() for an example of how to use a
 similar API.</p>
 
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
index 9cadde94..6666f2fc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
@@ -25,7 +25,7 @@
 @returns(gboolean)
 def callable_info_may_return_null(info)
 </code></synopsis>
-<p>See if a callable could return %NULL.</p>
+<p>See if a callable could return None.</p>
 
 <table>
 <tr>
@@ -34,7 +34,7 @@ def callable_info_may_return_null(info)
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>%TRUE if callable could return %NULL</p></td>
+<td><p>%TRUE if callable could return None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
index 6feae408..29bce581 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
@@ -42,7 +42,7 @@ def enum_info_get_value(info, n)
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the enumeration value or %NULL if type tag is wrong,</p></td>
+<td><p>the enumeration value or None if type tag is wrong,</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
index 044d2d4a..8689d291 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
@@ -28,7 +28,7 @@ def function_info_get_property(info)
 <p>Obtain the property associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
 Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
 %GI_FUNCTION_IS_SETTER have a property set. For other cases,
-%NULL will be returned.</p><p>g_base_info_unref() when done.</p>
+None will be returned.</p><p>g_base_info_unref() when done.</p>
 
 <table>
 <tr>
@@ -37,7 +37,7 @@ Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTIO
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the property or %NULL if not set. Free it with</p></td>
+<td><p>the property or None if not set. Free it with</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
index e351ef9b..5995d259 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
@@ -27,7 +27,7 @@ def function_info_get_vfunc(info)
 </code></synopsis>
 <p>Obtain the virtual function associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
 Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
-a virtual function set. For other cases, %NULL will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p>
+a virtual function set. For other cases, None will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p>
 
 <table>
 <tr>
@@ -36,7 +36,7 @@ a virtual function set. For other cases, %NULL will be returned.</p><p>Free it b
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the virtual function or %NULL if not set.</p></td>
+<td><p>the virtual function or None if not set.</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
index d40a9635..01429a92 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
@@ -59,7 +59,7 @@ have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>
 </tr>
 <tr>
 <td><p>in_args :</p></td>
-<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be %NULL</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be None</p></td>
 </tr>
 <tr>
 <td><p>n_in_args :</p></td>
@@ -67,7 +67,7 @@ have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>
 </tr>
 <tr>
 <td><p>out_args :</p></td>
-<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be %NULL</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be None</p></td>
 </tr>
 <tr>
 <td><p>n_out_args :</p></td>
@@ -75,7 +75,7 @@ have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>
 </tr>
 <tr>
 <td><p>return_value :</p></td>
-<td><p>return location for the return value of the function. If the function returns void, @return_value may be %NULL</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be None</p></td>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
index fc0fe6e9..45066fc6 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
@@ -29,7 +29,7 @@
 @returns(GIRepository.FunctionInfo)
 def interface_info_find_method(info, name)
 </code></synopsis>
-<p>Obtain a method of the interface type given a @name. %NULL will be
+<p>Obtain a method of the interface type given a @name. None will be
 returned if there's no method available with that name.</p><p>Free the struct by calling g_base_info_unref() when done.</p>
 
 <table>
@@ -43,7 +43,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link> or %NULL if none found.</p></td>
+<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link> or None if none found.</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
index 5312ead6..44f10049 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
@@ -43,7 +43,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or None. Free it with</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
index 8926247e..d74b22f0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
@@ -34,7 +34,7 @@ def interface_info_get_iface_struct(info)
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or None. Free it with</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
index bd20026b..c286dc13 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
@@ -29,7 +29,7 @@
 @returns(GIRepository.FunctionInfo)
 def object_info_find_method(info, name)
 </code></synopsis>
-<p>Obtain a method of the object type given a @name. %NULL will be
+<p>Obtain a method of the object type given a @name. None will be
 returned if there's no method available with that name.</p><p>g_base_info_unref() when done.</p>
 
 <table>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
index 8a7311dc..123e92c5 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
@@ -34,7 +34,7 @@
 def object_info_find_method_using_interfaces(info, name, implementor)
 </code></synopsis>
 <p>Obtain a method of the object given a @name, searching both the
-object @info and any interfaces it implements.  %NULL will be
+object @info and any interfaces it implements.  None will be
 returned if there's no method available with that name.</p><p>Note that this function does *not* search parent classes; you will have
 to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
 
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
index 91be024a..59b1556f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
@@ -42,7 +42,7 @@ def object_info_find_signal(info, name)
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>Info for the signal with name @name in @info, or %NULL on failure.</p></td>
+<td><p>Info for the signal with name @name in @info, or None on failure.</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
index 69ee6c7b..f4a63c38 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
@@ -32,7 +32,7 @@ def object_info_find_vfunc(info, name)
 <p>Locate a virtual function slot with name @name. Note that the namespace
 for virtuals is distinct from that of methods; there may or may not be
 a concrete method associated for a virtual. If there is one, it may
-be retrieved using g_vfunc_info_get_invoker(), otherwise %NULL will be
+be retrieved using g_vfunc_info_get_invoker(), otherwise None will be
 returned.
 See the documentation for g_vfunc_info_get_invoker() for more
 information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
@@ -48,7 +48,7 @@ information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or None. Free it with</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
index 51a5ffd2..b7e5f4a6 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
@@ -35,7 +35,7 @@ structure.  This function returns the metadata for the class structure.</p><p>g_
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or %NULL. Free with</p></td>
+<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or None. Free with</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
index e7ebfbb3..ba8e0461 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
@@ -38,7 +38,7 @@ see g_object_info_get_get_value_function().</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the symbol or %NULL</p></td>
+<td><p>the symbol or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
index 2f56030d..5d2aa751 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
@@ -37,7 +37,7 @@ the base classes of this type, starting at the top type.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the function pointer or %NULL</p></td>
+<td><p>the function pointer or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
index cc77f6bf..31b51484 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
@@ -37,7 +37,7 @@ see g_object_info_get_ref_function().</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the symbol or %NULL</p></td>
+<td><p>the symbol or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
index eaafe975..bf88f934 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
@@ -37,7 +37,7 @@ the base classes of this type, starting at the top type.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the function pointer or %NULL</p></td>
+<td><p>the function pointer or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
index d575c55c..58b5d529 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
@@ -38,7 +38,7 @@ see g_object_info_get_set_value_function().</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the symbol or %NULL</p></td>
+<td><p>the symbol or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
index 02df8831..6bacaab0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
@@ -37,7 +37,7 @@ the base classes of this type, starting at the top type.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the function pointer or %NULL</p></td>
+<td><p>the function pointer or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
index e42e857e..5d0184dd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
@@ -37,7 +37,7 @@ see g_object_info_get_unref_function().</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the symbol or %NULL</p></td>
+<td><p>the symbol or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
index ae2d0c04..aa69e863 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
@@ -37,7 +37,7 @@ the base classes of this type, starting at the top type.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the function pointer or %NULL</p></td>
+<td><p>the function pointer or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
index f06d9f75..bb58a6ff 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
@@ -27,7 +27,7 @@ def signal_info_get_class_closure(info)
 </code></synopsis>
 <p>Obtain the class closure for this signal if one is set. The class
 closure is a virtual function on the type that the signal belongs to.
-If the signal lacks a closure %NULL will be returned.</p>
+If the signal lacks a closure None will be returned.</p>
 
 <table>
 <tr>
@@ -36,7 +36,7 @@ If the signal lacks a closure %NULL will be returned.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the class closure or %NULL</p></td>
+<td><p>the class closure or None</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
index 5ea29e39..3060e455 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
@@ -37,7 +37,7 @@ a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type()
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the <link xref="GIBaseInfo">GIBaseInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIBaseInfo">GIBaseInfo</link>, or None. Free it with</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
index f39307e2..b7957809 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
@@ -25,7 +25,7 @@
 @returns(gboolean)
 def type_info_is_zero_terminated(info)
 </code></synopsis>
-<p>Obtain if the last element of the array is %NULL. The type tag must be a
+<p>Obtain if the last element of the array is None. The type tag must be a
 <link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or %FALSE will returned.</p>
 
 <table>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
index 889a2fdf..aa7b596c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
@@ -43,7 +43,7 @@ is the implementation for @info.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>address to a function or %NULL if an error happened</p></td>
+<td><p>address to a function or None if an error happened</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
index 90a66b9b..1b702fe7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
@@ -35,7 +35,7 @@ method will return it.  An invoker method is a C entry point.</p><p>Not all virt
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link> or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link> or None. Free it with</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
index 99353964..f22f901c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
@@ -36,7 +36,7 @@ this virtual function belongs.</p>
 </tr>
 <tr>
 <td><p>Returns :</p></td>
-<td><p>the signal or %NULL if none set</p></td>
+<td><p>the signal or None if none set</p></td>
 </tr>
 </table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
index a2f07f35..0d26921d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
@@ -64,7 +64,7 @@ argument lists.</p><p>error occurred.</p>
 </tr>
 <tr>
 <td><p>in_args :</p></td>
-<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be %NULL</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be None</p></td>
 </tr>
 <tr>
 <td><p>n_in_args :</p></td>
@@ -72,7 +72,7 @@ argument lists.</p><p>error occurred.</p>
 </tr>
 <tr>
 <td><p>out_args :</p></td>
-<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be %NULL</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be None</p></td>
 </tr>
 <tr>
 <td><p>n_out_args :</p></td>
@@ -80,7 +80,7 @@ argument lists.</p><p>error occurred.</p>
 </tr>
 <tr>
 <td><p>return_value :</p></td>
-<td><p>return location for the return value of the function. If the function returns void, @return_value may be %NULL</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be None</p></td>
 </tr>
 <tr>
 <td><p>Returns :</p></td>