diff options
| -rw-r--r-- | gir/gio-2.0.c | 111 | ||||
| -rw-r--r-- | gir/glib-2.0.c | 437 | ||||
| -rw-r--r-- | gir/gobject-2.0.c | 14 | ||||
| -rw-r--r-- | giscanner/cachestore.py | 24 | ||||
| -rw-r--r-- | giscanner/ccompiler.py | 2 | ||||
| -rw-r--r-- | giscanner/codegen.py | 4 | ||||
| -rw-r--r-- | giscanner/docmain.py | 2 | ||||
| -rw-r--r-- | giscanner/dumper.py | 4 | ||||
| -rw-r--r-- | giscanner/gdumpparser.py | 2 | ||||
| -rw-r--r-- | giscanner/giscannermodule.c | 10 | ||||
| -rw-r--r-- | giscanner/libtoolimporter.py | 73 | ||||
| -rw-r--r-- | giscanner/meson.build | 1 | ||||
| -rw-r--r-- | giscanner/scannermain.py | 16 | ||||
| -rw-r--r-- | giscanner/sourcescanner.py | 17 | ||||
| -rw-r--r-- | giscanner/utils.py | 50 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | misc/update-gtkdoc-tests.py | 2 | ||||
| -rw-r--r-- | misc/update-vulkan-gir.py | 2 | ||||
| -rw-r--r-- | tests/scanner/test_maintransformer.py | 2 | ||||
| -rw-r--r-- | tests/scanner/test_transformer.py | 2 | ||||
| -rw-r--r-- | tests/warn/warningtester.py | 2 |
21 files changed, 595 insertions, 184 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 646a759a..693c4295 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -3365,7 +3365,7 @@ * multiple times (or not at all) for a given connectable (in * particular, if @client ends up attempting to connect to more than * one address). However, if @client emits the #GSocketClient::event - * signal at all for a given connectable, that it will always emit + * signal at all for a given connectable, then it will always emit * it with %G_SOCKET_CLIENT_COMPLETE when it is done. * * Note that there may be additional #GSocketClientEvent values in @@ -3627,6 +3627,19 @@ /** + * GTlsCertificate:pkcs11-uri: (nullable) + * + * A URI referencing the PKCS \#11 objects containing an X.509 certificate + * and optionally a private key. + * + * If %NULL the certificate is either not backed by PKCS \#11 or the + * #GTlsBackend does not support PKCS \#11. + * + * Since: 2.68 + */ + + +/** * GTlsCertificate:private-key: * * The DER (binary) encoded representation of the certificate's @@ -3662,6 +3675,15 @@ /** + * GTlsCertificate:private-key-pkcs11-uri: (nullable) + * + * A URI referencing a PKCS \#11 object containing a private key. + * + * Since: 2.68 + */ + + +/** * GTlsClientConnection: * * Abstract base class for the backend-specific client connection @@ -21216,6 +21238,30 @@ /** + * g_file_build_attribute_list_for_copy: + * @file: a #GFile to copy attributes to + * @flags: a set of #GFileCopyFlags + * @cancellable: (nullable): optional #GCancellable object, + * %NULL to ignore + * @error: a #GError, %NULL to ignore + * + * Prepares the file attribute query string for copying to @file. + * + * This function prepares an attribute query string to be + * passed to g_file_query_info() to get a list of attributes + * normally copied with the file (see g_file_copy_attributes() + * for the detailed description). This function is used by the + * implementation of g_file_copy_attributes() and is useful + * when one needs to query and set the attributes in two + * stages (e.g., for recursive move of a directory). + * + * Returns: an attribute query string for g_file_query_info(), + * or %NULL if an error occurs. + * Since: 2.68 + */ + + +/** * g_file_copy: * @source: input #GFile * @destination: destination #GFile @@ -34665,6 +34711,15 @@ * * This is the asynchronous version of g_socket_client_connect(). * + * You may wish to prefer the asynchronous version even in synchronous + * command line programs because, since 2.60, it implements + * [RFC 8305](https://tools.ietf.org/html/rfc8305) "Happy Eyeballs" + * recommendations to work around long connection timeouts in networks + * where IPv6 is broken by performing an IPv4 connection simultaneously + * without waiting for IPv6 to time out, which is not supported by the + * synchronous call. (This is not an API guarantee, and may change in + * the future.) + * * When the operation is finished @callback will be * called. You can then call g_socket_client_connect_finish() to get * the result of the operation. @@ -37526,6 +37581,25 @@ /** + * g_subprocess_launcher_close: + * @self: a #GSubprocessLauncher + * + * Closes all the file descriptors previously passed to the object with + * g_subprocess_launcher_take_fd(), g_subprocess_launcher_take_stderr_fd(), etc. + * + * After calling this method, any subsequent calls to g_subprocess_launcher_spawn() or g_subprocess_launcher_spawnv() will + * return %G_IO_ERROR_CLOSED. This method is idempotent if + * called more than once. + * + * This function is called automatically when the #GSubprocessLauncher + * is disposed, but is provided separately so that garbage collected + * language bindings can call it earlier to guarantee when FDs are closed. + * + * Since: 2.68 + */ + + +/** * g_subprocess_launcher_getenv: * @self: a #GSubprocessLauncher * @variable: (type filename): the environment variable to get @@ -39186,6 +39260,41 @@ /** + * g_tls_certificate_new_from_pkcs11_uris: + * @pkcs11_uri: A PKCS \#11 URI + * @private_key_pkcs11_uri: (nullable): A PKCS \#11 URI + * @error: #GError for error reporting, or %NULL to ignore. + * + * Creates a #GTlsCertificate from a PKCS \#11 URI. + * + * An example @pkcs11_uri would be `pkcs11:model=Model;manufacturer=Manufacture;serial=1;token=My%20Client%20Certificate;id=%01` + * + * Where the token’s layout is: + * + * ``` + * Object 0: + * URL: pkcs11:model=Model;manufacturer=Manufacture;serial=1;token=My%20Client%20Certificate;id=%01;object=private%20key;type=private + * Type: Private key (RSA-2048) + * ID: 01 + * + * Object 1: + * URL: pkcs11:model=Model;manufacturer=Manufacture;serial=1;token=My%20Client%20Certificate;id=%01;object=Certificate%20for%20Authentication;type=cert + * Type: X.509 Certificate (RSA-2048) + * ID: 01 + * ``` + * + * In this case the certificate and private key would both be detected and used as expected. + * @pkcs_uri may also just reference an X.509 certificate object and then optionally + * @private_key_pkcs11_uri allows using a private key exposed under a different URI. + * + * Note that the private key is not accessed until usage and may fail or require a PIN later. + * + * Returns: (transfer full): the new certificate, or %NULL on error + * Since: 2.68 + */ + + +/** * g_tls_certificate_verify: * @cert: a #GTlsCertificate * @identity: (nullable): the expected peer identity diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 3463a2ac..f8284878 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -5557,7 +5557,7 @@ /** - * SECTION:datetime + * SECTION:date-time * @title: GDateTime * @short_description: a structure representing Date and Time * @see_also: #GTimeZone @@ -6075,6 +6075,27 @@ /** + * SECTION:gstrvbuilder + * @title: GStrvBuilder + * @short_description: Helper to create NULL-terminated string arrays. + * + * #GStrvBuilder is a method of easily building dynamically sized + * NULL-terminated string arrays. + * + * The following example shows how to build a two element array: + * + * |[<!-- language="C" --> + * g_autoptr(GStrvBuilder) builder = g_strv_builder_new (); + * g_strv_builder_add (builder, "hello"); + * g_strv_builder_add (builder, "world"); + * g_auto(GStrv) array = g_strv_builder_end (builder); + * ]| + * + * Since: 2.68 + */ + + +/** * SECTION:gunix * @title: UNIX-specific utilities and integration * @short_description: pipes, signal handling @@ -7475,7 +7496,8 @@ * It is recommended that custom log writer functions re-use the * `G_MESSAGES_DEBUG` environment variable, rather than inventing a custom one, * so that developers can re-use the same debugging techniques and tools across - * projects. + * projects. Since GLib 2.68, this can be implemented by dropping messages + * for which g_log_writer_default_would_drop() returns %TRUE. * * ## Testing for Messages ## {#testing-for-messages} * @@ -8678,7 +8700,7 @@ /** - * SECTION:treesbinary + * SECTION:trees-binary * @title: Balanced Binary Trees * @short_description: a sorted collection of key/value pairs optimized * for searching and traversing in order @@ -8711,7 +8733,7 @@ /** - * SECTION:treesnary + * SECTION:trees-nary * @title: N-ary Trees * @short_description: trees of data with any number of branches * @@ -13491,7 +13513,7 @@ * * the application must not wait for @pid to exit by any other * mechanism, including `waitpid(pid, ...)` or a second child-watch * source for the same @pid - * * the application must not ignore SIGCHILD + * * the application must not ignore `SIGCHLD` * * If any of those conditions are not met, this and related APIs will * not work correctly. This can often be diagnosed via a GLib warning @@ -20080,7 +20102,7 @@ * * Returns the name of the start group of the file. * - * Returns: The start group of the key file. + * Returns: (nullable): The start group of the key file. * Since: 2.6 */ @@ -20832,7 +20854,7 @@ /** * g_list_free: - * @list: a #GList + * @list: the first link of a #GList * * Frees all of the memory used by a #GList. * The freed elements are returned to the slice allocator. @@ -20870,7 +20892,7 @@ /** * g_list_free_full: - * @list: a pointer to a #GList + * @list: the first link of a #GList * @free_func: the function to be called to free each element's data * * Convenience method, which frees all the memory used by a #GList, @@ -21358,7 +21380,8 @@ * * stderr is used for levels %G_LOG_LEVEL_ERROR, %G_LOG_LEVEL_CRITICAL, * %G_LOG_LEVEL_WARNING and %G_LOG_LEVEL_MESSAGE. stdout is used for - * the rest. + * the rest, unless stderr was requested by + * g_log_writer_default_set_use_stderr(). * * This has no effect if structured logging is enabled; see * [Using Structured Logging][using-structured-logging]. @@ -21700,12 +21723,79 @@ * messages unless their log domain (or `all`) is listed in the space-separated * `G_MESSAGES_DEBUG` environment variable. * + * g_log_writer_default() uses the mask set by g_log_set_always_fatal() to + * determine which messages are fatal. When using a custom writer func instead it is + * up to the writer function to determine which log messages are fatal. + * * Returns: %G_LOG_WRITER_HANDLED on success, %G_LOG_WRITER_UNHANDLED otherwise * Since: 2.50 */ /** + * g_log_writer_default_set_use_stderr: + * @use_stderr: If %TRUE, use `stderr` for log messages that would + * normally have appeared on `stdout` + * + * Configure whether the built-in log functions + * (g_log_default_handler() for the old-style API, and both + * g_log_writer_default() and g_log_writer_standard_streams() for the + * structured API) will output all log messages to `stderr`. + * + * By default, log messages of levels %G_LOG_LEVEL_INFO and + * %G_LOG_LEVEL_DEBUG are sent to `stdout`, and other log messages are + * sent to `stderr`. This is problematic for applications that intend + * to reserve `stdout` for structured output such as JSON or XML. + * + * This function sets global state. It is not thread-aware, and should be + * called at the very start of a program, before creating any other threads + * or creating objects that could create worker threads of their own. + * + * Since: 2.68 + */ + + +/** + * g_log_writer_default_would_drop: + * @log_domain: (nullable): log domain + * @log_level: log level, either from #GLogLevelFlags, or a user-defined + * level + * + * Check whether g_log_writer_default() and g_log_default_handler() would + * ignore a message with the given domain and level. + * + * As with g_log_default_handler(), this function drops debug and informational + * messages unless their log domain (or `all`) is listed in the space-separated + * `G_MESSAGES_DEBUG` environment variable. + * + * This can be used when implementing log writers with the same filtering + * behaviour as the default, but a different destination or output format: + * + * |[<!-- language="C" --> + * if (g_log_writer_default_would_drop (log_level, log_domain)) + * return G_LOG_WRITER_HANDLED; + * ]| + * + * or to skip an expensive computation if it is only needed for a debugging + * message, and `G_MESSAGES_DEBUG` is not set: + * + * |[<!-- language="C" --> + * if (!g_log_writer_default_would_drop (G_LOG_LEVEL_DEBUG, G_LOG_DOMAIN)) + * { + * gchar *result = expensive_computation (my_object); + * + * g_debug ("my_object result: %s", result); + * g_free (result); + * } + * ]| + * + * Returns: %TRUE if the log message would be dropped by GLib's + * default log handlers + * Since: 2.68 + */ + + +/** * g_log_writer_format_fields: * @log_level: log level, either from #GLogLevelFlags, or a user-defined * level @@ -21785,7 +21875,9 @@ * * Format a structured log message and print it to either `stdout` or `stderr`, * depending on its log level. %G_LOG_LEVEL_INFO and %G_LOG_LEVEL_DEBUG messages - * are sent to `stdout`; all other log levels are sent to `stderr`. Only fields + * are sent to `stdout`, or to `stderr` if requested by + * g_log_writer_default_set_use_stderr(); + * all other log levels are sent to `stderr`. Only fields * which are understood by this function are included in the formatted string * which is printed. * @@ -22007,7 +22099,7 @@ * If you need to hold a reference on the context, use * g_main_context_ref_thread_default() instead. * - * Returns: (transfer none): the thread-default #GMainContext, or + * Returns: (transfer none) (nullable): the thread-default #GMainContext, or * %NULL if the thread-default context is the global default context. * Since: 2.22 */ @@ -22346,7 +22438,7 @@ * * Returns the currently firing source for this thread. * - * Returns: (transfer none): The currently firing source or %NULL. + * Returns: (transfer none) (nullable): The currently firing source or %NULL. * Since: 2.12 */ @@ -29424,7 +29516,7 @@ /** * g_slist_free: - * @list: a #GSList + * @list: the first link of a #GSList * * Frees all of the memory used by a #GSList. * The freed elements are returned to the slice allocator. @@ -29462,7 +29554,7 @@ /** * g_slist_free_full: - * @list: a pointer to a #GSList + * @list: the first link of a #GSList * @free_func: the function to be called to free each element's data * * Convenience method, which frees all the memory used by a #GSList, and @@ -29943,7 +30035,7 @@ * Gets a name for the source, used in debugging and profiling. The * name may be #NULL if it has never been set with g_source_set_name(). * - * Returns: the name of the source + * Returns: (nullable): the name of the source * Since: 2.26 */ @@ -32361,6 +32453,67 @@ /** + * g_strv_builder_add: + * @builder: a #GStrvBuilder + * @value: a string. + * + * Add a string to the end of the array. + * + * Since 2.68 + */ + + +/** + * g_strv_builder_end: + * @builder: a #GStrvBuilder + * + * Ends the builder process and returns the constructed NULL-terminated string + * array. The returned value should be freed with g_strfreev() when no longer + * needed. + * + * Returns: (transfer full): the constructed string array. + * + * Since 2.68 + */ + + +/** + * g_strv_builder_new: + * + * Creates a new #GStrvBuilder with a reference count of 1. + * Use g_strv_builder_unref() on the returned value when no longer needed. + * + * Returns: (transfer full): the new #GStrvBuilder + * Since: 2.68 + */ + + +/** + * g_strv_builder_ref: + * @builder: (transfer none): a #GStrvBuilder + * + * Atomically increments the reference count of @builder by one. + * This function is thread-safe and may be called from any thread. + * + * Returns: (transfer full): The passed in #GStrvBuilder + * Since: 2.68 + */ + + +/** + * g_strv_builder_unref: + * @builder: (transfer full): a #GStrvBuilder allocated by g_strv_builder_new() + * + * Decreases the reference count on @builder. + * + * In the event that there are no more references, releases all memory + * associated with the #GStrvBuilder. + * + * Since: 2.68 + */ + + +/** * g_strv_contains: * @strv: a %NULL-terminated array of strings * @str: a string @@ -34695,6 +34848,26 @@ /** + * g_tree_foreach_node: + * @tree: a #GTree + * @func: the function to call for each node visited. + * If this function returns %TRUE, the traversal is stopped. + * @user_data: user data to pass to the function + * + * Calls the given function for each of the nodes in the #GTree. + * The function is passed the pointer to the particular node, and the given + * @data parameter. The tree traversal happens in-order. + * + * The tree may not be modified while iterating over it (you can't + * add/remove items). To remove all items matching a predicate, you need + * to add each item to a list in your #GTraverseFunc as you walk over + * the tree, then walk the list and remove each item. + * + * Since: 2.68 + */ + + +/** * g_tree_height: * @tree: a #GTree * @@ -34716,6 +34889,19 @@ * * Inserts a key/value pair into a #GTree. * + * Inserts a new key and value into a #GTree as g_tree_insert_node() does, + * only this function does not return the inserted or set node. + */ + + +/** + * g_tree_insert_node: + * @tree: a #GTree + * @key: the key to insert + * @value: the value corresponding to the key + * + * Inserts a key/value pair into a #GTree. + * * If the given key already exists in the #GTree its corresponding value * is set to the new value. If you supplied a @value_destroy_func when * creating the #GTree, the old value is freed using that function. If @@ -34727,6 +34913,9 @@ * The cost of maintaining a balanced tree while inserting new key/value * result in a O(n log(n)) operation where most of the other operations * are O(log(n)). + * + * Returns: (transfer none): the inserted (or set) node. + * Since: 2.68 */ @@ -34761,6 +34950,40 @@ /** + * g_tree_lookup_node: + * @tree: a #GTree + * @key: the key to look up + * + * Gets the tree node corresponding to the given key. Since a #GTree is + * automatically balanced as key/value pairs are added, key lookup + * is O(log n) (where n is the number of key/value pairs in the tree). + * + * Returns: (nullable) (transfer none): the tree node corresponding to + * the key, or %NULL if the key was not found + * Since: 2.68 + */ + + +/** + * g_tree_lower_bound: + * @tree: a #GTree + * @key: the key to calculate the lower bound for + * + * Gets the lower bound node corresponding to the given key, + * or %NULL if the tree is empty or all the nodes in the tree + * have keys that are strictly lower than the searched key. + * + * The lower bound is the first node that has its key greater + * than or equal to the searched key. + * + * Returns: (nullable) (transfer none): the tree node corresponding to + * the lower bound, or %NULL if the tree is empty or has only + * keys strictly lower than the searched key. + * Since: 2.68 + */ + + +/** * g_tree_new: * @key_compare_func: the function used to order the nodes in the #GTree. * It should return values similar to the standard strcmp() function - @@ -34816,6 +35039,76 @@ /** + * g_tree_node_first: + * @tree: a #GTree + * + * Returns the first in-order node of the tree, or %NULL + * for an empty tree. + * + * Returns: (nullable) (transfer none): the first node in the tree + * Since: 2.68 + */ + + +/** + * g_tree_node_key: + * @node: a #GTree node + * + * Gets the key stored at a particular tree node. + * + * Returns: (nullable) (transfer none): the key at the node. + * Since: 2.68 + */ + + +/** + * g_tree_node_last: + * @tree: a #GTree + * + * Returns the last in-order node of the tree, or %NULL + * for an empty tree. + * + * Returns: (nullable) (transfer none): the last node in the tree + * Since: 2.68 + */ + + +/** + * g_tree_node_next: + * @node: a #GTree node + * + * Returns the next in-order node of the tree, or %NULL + * if the passed node was already the last one. + * + * Returns: (nullable) (transfer none): the next node in the tree + * Since: 2.68 + */ + + +/** + * g_tree_node_previous: + * @node: a #GTree node + * + * Returns the previous in-order node of the tree, or %NULL + * if the passed node was already the first one. + * + * Returns: (nullable) (transfer none): the previous node in the tree + * Since: 2.68 + */ + + +/** + * g_tree_node_value: + * @node: a #GTree node + * + * Gets the value stored at a particular tree node. + * + * Returns: (nullable) (transfer none): the value at the node. + * Since: 2.68 + */ + + +/** * g_tree_ref: * @tree: a #GTree * @@ -34855,7 +35148,18 @@ * @key: the key to insert * @value: the value corresponding to the key * - * Inserts a new key and value into a #GTree similar to g_tree_insert(). + * Inserts a new key and value into a #GTree as g_tree_replace_node() does, + * only this function does not return the inserted or set node. + */ + + +/** + * g_tree_replace_node: + * @tree: a #GTree + * @key: the key to insert + * @value: the value corresponding to the key + * + * Inserts a new key and value into a #GTree similar to g_tree_insert_node(). * The difference is that if the key already exists in the #GTree, it gets * replaced by the new key. If you supplied a @value_destroy_func when * creating the #GTree, the old value is freed using that function. If you @@ -34864,6 +35168,9 @@ * * The tree is automatically 'balanced' as new key/value pairs are added, * so that the distance from the root to every leaf is as small as possible. + * + * Returns: (transfer none): the inserted (or set) node. + * Since: 2.68 */ @@ -34889,6 +35196,28 @@ /** + * g_tree_search_node: + * @tree: a #GTree + * @search_func: a function used to search the #GTree + * @user_data: the data passed as the second argument to @search_func + * + * Searches a #GTree using @search_func. + * + * The @search_func is called with a pointer to the key of a key/value + * pair in the tree, and the passed in @user_data. If @search_func returns + * 0 for a key/value pair, then the corresponding node is returned as + * the result of g_tree_search(). If @search_func returns -1, searching + * will proceed among the key/value pairs that have a smaller key; if + * @search_func returns 1, searching will proceed among the key/value + * pairs that have a larger key. + * + * Returns: (nullable) (transfer none): the node corresponding to the + * found key, or %NULL if the key was not found + * Since: 2.68 + */ + + +/** * g_tree_steal: * @tree: a #GTree * @key: the key to remove @@ -34937,6 +35266,25 @@ /** + * g_tree_upper_bound: + * @tree: a #GTree + * @key: the key to calculate the upper bound for + * + * Gets the upper bound node corresponding to the given key, + * or %NULL if the tree is empty or all the nodes in the tree + * have keys that are lower than or equal to the searched key. + * + * The upper bound is the first node that has its key strictly greater + * than the searched key. + * + * Returns: (nullable) (transfer none): the tree node corresponding to the + * upper bound, or %NULL if the tree is empty or has only keys + * lower than or equal to the searched key. + * Since: 2.68 + */ + + +/** * g_try_malloc: * @n_bytes: number of bytes to allocate. * @@ -35934,7 +36282,7 @@ * See also g_uri_build_with_user(), which allows specifying the * components of the "userinfo" separately. * - * Returns: (transfer full): a new #GUri + * Returns: (not nullable) (transfer full): a new #GUri * Since: 2.66 */ @@ -35961,7 +36309,7 @@ * of the ‘userinfo’ field separately. Note that @user must be non-%NULL * if either @password or @auth_params is non-%NULL. * - * Returns: (transfer full): a new #GUri + * Returns: (not nullable) (transfer full): a new #GUri * Since: 2.66 */ @@ -35985,8 +36333,8 @@ * Though technically incorrect, this will also allow escaping nul * bytes as `%``00`. * - * Returns: (transfer full): an escaped version of @unescaped. The returned - * string should be freed when no longer needed. + * Returns: (not nullable) (transfer full): an escaped version of @unescaped. + * The returned string should be freed when no longer needed. * Since: 2.66 */ @@ -36007,8 +36355,8 @@ * in the URI specification, since those are allowed unescaped in some * portions of a URI. * - * Returns: an escaped version of @unescaped. The returned string - * should be freed when no longer needed. + * Returns: (not nullable): an escaped version of @unescaped. The + * returned string should be freed when no longer needed. * Since: 2.16 */ @@ -36207,7 +36555,7 @@ * %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set * in @flags. * - * Returns: (transfer full): an absolute URI string + * Returns: (not nullable) (transfer full): an absolute URI string * Since: 2.66 */ @@ -36237,7 +36585,7 @@ * %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set * in @flags. * - * Returns: (transfer full): an absolute URI string + * Returns: (not nullable) (transfer full): an absolute URI string * Since: 2.66 */ @@ -36343,7 +36691,7 @@ * valid [absolute URI][relative-absolute-uris], it will be discarded, and an * error returned. * - * Returns: (transfer full): a new #GUri. + * Returns: (transfer full): a new #GUri, or NULL on error. * Since: 2.66 */ @@ -36386,9 +36734,9 @@ * If @params cannot be parsed (for example, it contains two @separators * characters in a row), then @error is set and %NULL is returned. * - * Returns: (transfer full) (element-type utf8 utf8): A hash table of - * attribute/value pairs, with both names and values fully-decoded; or %NULL - * on error. + * Returns: (transfer full) (element-type utf8 utf8): + * A hash table of attribute/value pairs, with both names and values + * fully-decoded; or %NULL on error. * Since: 2.66 */ @@ -36405,7 +36753,7 @@ * If the result is not a valid absolute URI, it will be discarded, and an error * returned. * - * Returns: (transfer full): a new #GUri. + * Returns: (transfer full): a new #GUri, or NULL on error. * Since: 2.66 */ @@ -36476,7 +36824,8 @@ * (If @base_uri_string is %NULL, this just returns @uri_ref, or * %NULL if @uri_ref is invalid or not absolute.) * - * Returns: (transfer full): the resolved URI string. + * Returns: (transfer full): the resolved URI string, + * or NULL on error. * Since: 2.66 */ @@ -36608,8 +36957,8 @@ * or private data in its query string, and the returned string is going to be * logged, then consider using g_uri_to_string_partial() to redact parts. * - * Returns: (transfer full): a string representing @uri, which the caller - * must free. + * Returns: (not nullable) (transfer full): a string representing @uri, + * which the caller must free. * Since: 2.66 */ @@ -36622,8 +36971,8 @@ * Returns a string representing @uri, subject to the options in * @flags. See g_uri_to_string() and #GUriHideFlags for more details. * - * Returns: (transfer full): a string representing @uri, which the caller - * must free. + * Returns: (not nullable) (transfer full): a string representing + * @uri, which the caller must free. * Since: 2.66 */ @@ -36648,9 +36997,9 @@ * being expanded in an escaped path element, which might confuse pathname * handling. * - * Returns: (transfer full): an unescaped version of @escaped_string or %NULL on - * error (if decoding failed, using %G_URI_ERROR_FAILED error code). The - * returned #GBytes should be unreffed when no longer needed. + * Returns: (transfer full): an unescaped version of @escaped_string + * or %NULL on error (if decoding failed, using %G_URI_ERROR_FAILED error + * code). The returned #GBytes should be unreffed when no longer needed. * Since: 2.66 */ @@ -36674,10 +37023,10 @@ * Note: `NUL` byte is not accepted in the output, in contrast to * g_uri_unescape_bytes(). * - * Returns: an unescaped version of @escaped_string or %NULL on error. - * The returned string should be freed when no longer needed. As a - * special case if %NULL is given for @escaped_string, this function - * will return %NULL. + * Returns: (nullable): an unescaped version of @escaped_string, + * or %NULL on error. The returned string should be freed when no longer + * needed. As a special case if %NULL is given for @escaped_string, this + * function will return %NULL. * Since: 2.16 */ @@ -36696,8 +37045,8 @@ * want to avoid for instance having a slash being expanded in an * escaped path element, which might confuse pathname handling. * - * Returns: an unescaped version of @escaped_string. The returned string - * should be freed when no longer needed. + * Returns: (nullable): an unescaped version of @escaped_string. + * The returned string should be freed when no longer needed. * Since: 2.16 */ @@ -36781,7 +37130,7 @@ * string; it may e.g. include embedded NUL characters. The only * validation done by this function is to ensure that the input can * be correctly interpreted as UTF-16, i.e. it doesn't contain - * things unpaired surrogates. + * unpaired surrogates or partial character sequences. * * Returns: (transfer full): a pointer to a newly allocated UTF-8 string. * This value must be freed with g_free(). If an error occurs, diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 56947b35..e7831801 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -827,7 +827,12 @@ * * Retrieves the #GObject instance used as the source of the binding. * - * Returns: (transfer none): the source #GObject + * A #GBinding can outlive the source #GObject as the binding does not hold a + * strong reference to the source. If the source is destroyed before the + * binding then this function will return %NULL. + * + * Returns: (transfer none) (nullable): the source #GObject, or %NULL if the + * source does not exist any more. * Since: 2.26 */ @@ -850,7 +855,12 @@ * * Retrieves the #GObject instance used as the target of the binding. * - * Returns: (transfer none): the target #GObject + * A #GBinding can outlive the target #GObject as the binding does not hold a + * strong reference to the target. If the target is destroyed before the + * binding then this function will return %NULL. + * + * Returns: (transfer none) (nullable): the target #GObject, or %NULL if the + * target does not exist any more. * Since: 2.26 */ diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py index baaaf1ed..3512badc 100644 --- a/giscanner/cachestore.py +++ b/giscanner/cachestore.py @@ -65,7 +65,7 @@ class CacheStore(object): current_hash = _get_versionhash() version = os.path.join(self._directory, _CACHE_VERSION_FILENAME) try: - with open(version, 'r') as version_file: + with open(version, 'r', encoding='utf-8') as version_file: cache_hash = version_file.read() except (IOError, OSError) as e: # File does not exist @@ -81,7 +81,7 @@ class CacheStore(object): tmp_fd, tmp_filename = tempfile.mkstemp(prefix='g-ir-scanner-cache-version-') try: - with os.fdopen(tmp_fd, 'w') as tmp_file: + with os.fdopen(tmp_fd, 'w', encoding='utf-8') as tmp_file: tmp_file.write(current_hash) # On Unix, this would just be os.rename() but Windows @@ -169,12 +169,14 @@ class CacheStore(object): return None else: raise - if not self._cache_is_valid(store_filename, filename): - return None - try: - data = pickle.load(fd) - except Exception: - # Broken cache entry, remove it - self._remove_filename(store_filename) - data = None - return data + + with fd: + if not self._cache_is_valid(store_filename, filename): + return None + try: + data = pickle.load(fd) + except Exception: + # Broken cache entry, remove it + self._remove_filename(store_filename) + data = None + return data diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py index bd1aa78e..cb97e76f 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -387,7 +387,7 @@ class CCompiler(object): output_flag = ['-out:' + tmp_filename] proc = subprocess.call(args + [implib] + output_flag, stdout=subprocess.PIPE) - with open(tmp_filename, 'r') as tmp_fileobj: + with open(tmp_filename, 'r', encoding='utf-8') as tmp_fileobj: for line in tmp_fileobj.read().splitlines(): if '__IMPORT_DESCRIPTOR_' in line: diff --git a/giscanner/codegen.py b/giscanner/codegen.py index 138acf72..9faf3cab 100644 --- a/giscanner/codegen.py +++ b/giscanner/codegen.py @@ -161,8 +161,8 @@ class CCodeGenerator(object): self._function_bodies[node] = body def codegen(self): - self.out_h = open(self.out_h_filename, 'w') - self.out_c = open(self.out_c_filename, 'w') + self.out_h = open(self.out_h_filename, 'w', encoding='utf-8') + self.out_c = open(self.out_c_filename, 'w', encoding='utf-8') self._codegen_start() diff --git a/giscanner/docmain.py b/giscanner/docmain.py index 6ef1de4e..dab063ef 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -71,7 +71,7 @@ def doc_main(args): if args.format == 'sections': sections_file = generate_sections_file(transformer) - with open(args.output, 'w') as fp: + with open(args.output, 'w', encoding='utf-8') as fp: write_sections_file(fp, sections_file) else: writer = DocWriter(transformer, args.language, args.format) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index e4b6ea03..f61c46c1 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -111,13 +111,13 @@ class DumpCompiler(object): 'gobject-introspection-1.0', 'gdump.c') if not os.path.isfile(gdump_path): raise SystemExit("Couldn't find %r" % (gdump_path, )) - with open(gdump_path) as gdump_file: + with open(gdump_path, encoding='utf-8') as gdump_file: gdump_contents = gdump_file.read() tpl_args['gdump_include'] = gdump_contents tpl_args['init_sections'] = "\n".join(self._options.init_sections) c_path = self._generate_tempfile(tmpdir, '.c') - with open(c_path, 'w') as f: + with open(c_path, 'w', encoding='utf-8') as f: f.write(_PROGRAM_TEMPLATE % tpl_args) # We need to reference our get_type and error_quark functions diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py index e7ccf575..3d9720d0 100644 --- a/giscanner/gdumpparser.py +++ b/giscanner/gdumpparser.py @@ -144,7 +144,7 @@ class GDumpParser(object): """Load the library (or executable), returning an XML blob containing data gleaned from GObject's primitive introspection.""" in_path = os.path.join(self._binary.tmpdir, 'functions.txt') - with open(in_path, 'w') as f: + with open(in_path, 'w', encoding='utf-8') as f: for func in self._get_type_functions: f.write('get-type:') f.write(func) diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c index 996a509e..2e7e55bc 100644 --- a/giscanner/giscannermodule.c +++ b/giscanner/giscannermodule.c @@ -28,10 +28,6 @@ #include <glib-object.h> -#ifndef Py_TYPE - #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) -#endif - #if PY_MAJOR_VERSION >= 3 #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void) #define MOD_ERROR_RETURN NULL @@ -53,8 +49,12 @@ PyTypeObject Py##cname##_Type = { \ 0 \ } +#if PY_VERSION_HEX < 0x030900A4 +# define Py_SET_TYPE(obj, type) ((Py_TYPE(obj) = (type)), (void)0) +#endif + #define REGISTER_TYPE(d, name, type) \ - Py_TYPE(&type) = &PyType_Type; \ + Py_SET_TYPE(&type, &PyType_Type); \ type.tp_alloc = PyType_GenericAlloc; \ type.tp_new = PyType_GenericNew; \ type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; \ diff --git a/giscanner/libtoolimporter.py b/giscanner/libtoolimporter.py deleted file mode 100644 index c8501035..00000000 --- a/giscanner/libtoolimporter.py +++ /dev/null @@ -1,73 +0,0 @@ -# -*- Mode: Python -*- -# GObject-Introspection - a framework for introspecting GObject libraries -# Copyright (C) 2008 Johan Dahlin -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. -# - -import imp -import os -import sys - -from .utils import extract_libtool - - -class LibtoolImporter(object): - - def __init__(self, name, path): - self.name = name - self.path = path - - @classmethod - def find_module(cls, name, packagepath=None): - modparts = name.split('.') - filename = modparts.pop() + '.la' - - # Given some.package.module 'path' is where subpackages of some.package - # should be looked for. See if we can find a ".libs/module.la" relative - # to those directories and failing that look for file - # "some/package/.libs/module.la" relative to sys.path - if len(modparts) > 0: - modprefix = os.path.join(*modparts) - modprefix = os.path.join(modprefix, '.libs') - else: - modprefix = '.libs' - - for path in sys.path: - full = os.path.join(path, modprefix, filename) - if os.path.exists(full): - return cls(name, full) - - def load_module(self, name): - realpath = extract_libtool(self.path) - - # The first item of the suffix tuple (which can be, depending on platform, - # one or more valid filename extensions used to name c extension modules) - # is ignored by imp.load_module(). Thus, there is no use in pretending it - # is important and we set it to an empty string. - suffix = ('', 'rb', imp.C_EXTENSION) - - mod = imp.load_module(name, open(realpath), realpath, suffix) - mod.__loader__ = self - return mod - - @classmethod - def __enter__(cls): - sys.meta_path.append(cls) - - @classmethod - def __exit__(cls, exc_type, exc_val, exc_tb): - sys.meta_path.remove(cls) diff --git a/giscanner/meson.build b/giscanner/meson.build index a3b06f37..098b7b6b 100644 --- a/giscanner/meson.build +++ b/giscanner/meson.build @@ -13,7 +13,6 @@ giscanner_files = [ 'girparser.py', 'girwriter.py', 'gdumpparser.py', - 'libtoolimporter.py', 'maintransformer.py', 'mdextensions.py', 'message.py', diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index ca9065b2..957ba0b7 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -334,7 +334,7 @@ def extract_filelist(options): filenames = [] if not os.path.exists(options.filelist): _error('%s: no such filelist file' % (options.filelist, )) - with open(options.filelist, "r") as filelist_file: + with open(options.filelist, "r", encoding=None) as filelist_file: lines = filelist_file.readlines() for line in lines: # We don't support real C++ parsing yet, but we should be able @@ -472,6 +472,10 @@ def write_output(data, options): """Write encoded XML 'data' to the filename specified in 'options'.""" if options.output == "-": output = sys.stdout + try: + output.write(data) + except IOError as e: + _error("while writing output: %s" % (e.strerror, )) elif options.reparse_validate_gir: main_f, main_f_name = tempfile.mkstemp(suffix='.gir') @@ -500,14 +504,10 @@ def write_output(data, options): return 0 else: try: - output = open(options.output, 'wb') + with open(options.output, 'wb') as output: + output.write(data) except IOError as e: - _error("opening output for writing: %s" % (e.strerror, )) - - try: - output.write(data) - except IOError as e: - _error("while writing output: %s" % (e.strerror, )) + _error("opening/writing output: %s" % (e.strerror, )) def get_source_root_dirs(options, filenames): diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index e50f40aa..09f90441 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -21,19 +21,18 @@ import os import tempfile -from .libtoolimporter import LibtoolImporter from .message import Position from .ccompiler import CCompiler from .utils import have_debug_flag, dll_dirs -with LibtoolImporter(None, None): - dlldirs = dll_dirs() - dlldirs.add_dll_dirs(['gio-2.0']) - if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: - from _giscanner import SourceScanner as CSourceScanner - else: - from giscanner._giscanner import SourceScanner as CSourceScanner - dlldirs.cleanup_dll_dirs() + +dlldirs = dll_dirs() +dlldirs.add_dll_dirs(['gio-2.0']) +if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: + from _giscanner import SourceScanner as CSourceScanner +else: + from giscanner._giscanner import SourceScanner as CSourceScanner +dlldirs.cleanup_dll_dirs() HEADER_EXTS = ['.h', '.hpp', '.hxx'] SOURCE_EXTS = ['.c', '.cpp', '.cc', '.cxx'] diff --git a/giscanner/utils.py b/giscanner/utils.py index e3396c6e..a49aca6b 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py @@ -23,6 +23,7 @@ import os import subprocess import platform import shutil +import sys import time import giscanner.pkgconfig @@ -83,7 +84,7 @@ _libtool_pat = re.compile("dlname='([A-z0-9\\.\\-\\+]+)'\n") def _extract_dlname_field(la_file): - with open(la_file) as f: + with open(la_file, encoding='utf-8') as f: data = f.read() m = _libtool_pat.search(data) if m: @@ -96,7 +97,7 @@ _libtool_libdir_pat = re.compile("libdir='([^']+)'") def _extract_libdir_field(la_file): - with open(la_file) as f: + with open(la_file, encoding='utf-8') as f: data = f.read() m = _libtool_libdir_pat.search(data) if m: @@ -120,24 +121,10 @@ def extract_libtool_shlib(la_file): if libdir is None: return dlbasename return libdir + '/' + dlbasename - # From the comments in extract_libtool(), older libtools had - # a path rather than the raw dlname + # Older libtools had a path rather than the raw dlname return os.path.basename(dlname) -def extract_libtool(la_file): - dlname = _extract_dlname_field(la_file) - if dlname is None: - raise ValueError("%s has no dlname. Not a shared library?" % la_file) - libname = os.path.join(os.path.dirname(la_file), - '.libs', dlname) - # FIXME: This hackish, but I'm not sure how to do this - # in a way which is compatible with both libtool 2.2 - # and pre-2.2. Johan 2008-10-21 - libname = libname.replace('.libs/.libs', '.libs').replace('.libs\\.libs', '.libs') - return libname - - # Returns arguments for invoking libtool, if applicable, otherwise None def get_libtool_command(options): libtool_infection = not options.nolibtool @@ -318,3 +305,32 @@ class dll_dirs(): added_dll_dir.close() if self._cached_dll_dirs is not None: self._cached_dll_dirs.clear() + + +# monkey patch distutils.cygwinccompiler +# somehow distutils returns runtime library only up to +# VS2010 / MSVC 10.0 (msc_ver 1600) +def get_msvcr_overwrite(): + try: + return orig_get_msvcr() + except ValueError: + pass + + msc_pos = sys.version.find('MSC v.') + if msc_pos != -1: + msc_ver = sys.version[msc_pos + 6:msc_pos + 10] + + if msc_ver == '1700': + # VS2012 + return ['msvcr110'] + elif msc_ver == '1800': + # VS2013 + return ['msvcr120'] + elif msc_ver >= '1900': + # VS2015 + return ['vcruntime140'] + + +import distutils.cygwinccompiler +orig_get_msvcr = distutils.cygwinccompiler.get_msvcr +distutils.cygwinccompiler.get_msvcr = get_msvcr_overwrite diff --git a/meson.build b/meson.build index 3761af7f..3bbcf8de 100644 --- a/meson.build +++ b/meson.build @@ -283,7 +283,7 @@ pkg.generate( # FIXME: meson.override_dependency() and declare_dependency()'s variable arguments # are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as # subproject anyway -if meson.version().version_compare('>=0.54.0') +if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true girepo_dep = declare_dependency( sources: typelibs, dependencies: girepo_dep, diff --git a/misc/update-gtkdoc-tests.py b/misc/update-gtkdoc-tests.py index c182fc11..6f45e348 100644 --- a/misc/update-gtkdoc-tests.py +++ b/misc/update-gtkdoc-tests.py @@ -191,7 +191,7 @@ if __name__ == '__main__': writer = GtkDocCommentBlockWriter(indent=True) logger.enable_warnings(True) - with io.open(path, 'r') as f: + with io.open(path, 'r', encoding='utf-8') as f: lines = f.readlines() chunks = [] diff --git a/misc/update-vulkan-gir.py b/misc/update-vulkan-gir.py index 89792c12..4154702a 100644 --- a/misc/update-vulkan-gir.py +++ b/misc/update-vulkan-gir.py @@ -24,7 +24,7 @@ def show_func_defs(filename, output, extra_cpp_args=None): ast = parse_file(filename, use_cpp=True, cpp_args=extra_cpp_args) - with open(output, 'w') as f: + with open(output, 'w', encoding='utf-8') as f: f.write("""<?xml version="1.0"?> <repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" diff --git a/tests/scanner/test_maintransformer.py b/tests/scanner/test_maintransformer.py index abf3ee73..f0e2d629 100644 --- a/tests/scanner/test_maintransformer.py +++ b/tests/scanner/test_maintransformer.py @@ -16,7 +16,7 @@ def create_scanner_from_source_string(source): tmp_fd, tmp_name = tempfile.mkstemp(suffix='.h', text=True) try: - with os.fdopen(tmp_fd, 'wt') as file: + with os.fdopen(tmp_fd, 'w', encoding='utf-8') as file: file.write(source) ss.parse_files([tmp_name]) finally: diff --git a/tests/scanner/test_transformer.py b/tests/scanner/test_transformer.py index c6fbf4e7..3feed441 100644 --- a/tests/scanner/test_transformer.py +++ b/tests/scanner/test_transformer.py @@ -18,7 +18,7 @@ def create_scanner_from_source_string(source): tmp_fd, tmp_name = tempfile.mkstemp(suffix='.h', text=True) try: - with os.fdopen(tmp_fd, 'wt') as file: + with os.fdopen(tmp_fd, 'w', encoding='utf-8') as file: file.write(source) ss.parse_files([tmp_name]) finally: diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py index fedd3a59..3bb9e4b2 100644 --- a/tests/warn/warningtester.py +++ b/tests/warn/warningtester.py @@ -78,7 +78,7 @@ def _diff(a, b): def _extract_expected(filename): - fd = open(filename, 'r') + fd = open(filename, 'r', encoding='utf-8') data = fd.read() fd.close() |