gobject-introspection 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/vendor/local/lib/gobject-introspection/giscanner/cachestore.py

@@ -31,6 +31,7 @@ import giscanner
 
 _CACHE_VERSION_FILENAME = '.cache-version'
 
+
 def _get_versionhash():
     toplevel = os.path.dirname(giscanner.__file__)
     # Use pyc instead of py to avoid extra IO
@@ -40,6 +41,7 @@ def _get_versionhash():
     mtimes = (str(os.stat(source).st_mtime) for source in sources)
     return hashlib.sha1(''.join(mtimes)).hexdigest()
 
+
 def _get_cachedir():
     if 'GI_SCANNER_DISABLE_CACHE' in os.environ:
         return None
@@ -73,7 +75,7 @@ class CacheStore(object):
     def __init__(self):
         try:
             self._directory = _get_cachedir()
-        except OSError, e:
+        except OSError as e:
             if e.errno != errno.EPERM:
                 raise
             self._directory = None
@@ -88,7 +90,7 @@ class CacheStore(object):
         version = os.path.join(self._directory, _CACHE_VERSION_FILENAME)
         try:
             cache_hash = open(version).read()
-        except IOError, e:
+        except IOError as e:
             # File does not exist
             if e.errno == errno.ENOENT:
                 cache_hash = 0
@@ -101,7 +103,7 @@ class CacheStore(object):
         self._clean()
         try:
             fp = open(version, 'w')
-        except IOError, e:
+        except IOError as e:
             # Permission denied
             if e.errno == errno.EACCES:
                 return
@@ -126,13 +128,13 @@ class CacheStore(object):
     def _remove_filename(self, filename):
         try:
             os.unlink(filename)
-        except IOError, e:
+        except IOError as e:
             # Permission denied
             if e.errno == errno.EACCES:
                 return
             else:
                 raise
-        except OSError, e:
+        except OSError as e:
             # File does not exist
             if e.errno == errno.ENOENT:
                 return
@@ -150,14 +152,13 @@ class CacheStore(object):
         if store_filename is None:
             return
 
-        if (os.path.exists(store_filename) and
-            self._cache_is_valid(store_filename, filename)):
+        if (os.path.exists(store_filename) and self._cache_is_valid(store_filename, filename)):
             return None
 
         tmp_fd, tmp_filename = tempfile.mkstemp(prefix='g-ir-scanner-cache-')
         try:
             cPickle.dump(data, os.fdopen(tmp_fd, 'w'))
-        except IOError, e:
+        except IOError as e:
             # No space left on device
             if e.errno == errno.ENOSPC:
                 self._remove_filename(tmp_filename)
@@ -167,7 +168,7 @@ class CacheStore(object):
 
         try:
             shutil.move(tmp_filename, store_filename)
-        except IOError, e:
+        except IOError as e:
             # Permission denied
             if e.errno == errno.EACCES:
                 self._remove_filename(tmp_filename)
@@ -180,7 +181,7 @@ class CacheStore(object):
             return
         try:
             fd = open(store_filename)
-        except IOError, e:
+        except IOError as e:
             if e.errno == errno.ENOENT:
                 return None
             else:

data/vendor/local/lib/gobject-introspection/giscanner/codegen.py

@@ -24,6 +24,7 @@ from contextlib import contextmanager
 
 from . import ast
 
+
 class CCodeGenerator(object):
     def __init__(self, namespace, out_h_filename, out_c_filename):
         self.out_h_filename = out_h_filename
@@ -36,15 +37,16 @@ class CCodeGenerator(object):
         return '%s_%s' % (self.namespace.symbol_prefixes[0], name)
 
     def _typecontainer_to_ctype(self, param):
-        if (isinstance(param, ast.Parameter) and
-            param.direction in (ast.PARAM_DIRECTION_OUT,
-                                ast.PARAM_DIRECTION_INOUT)):
+        if (isinstance(param, ast.Parameter)
+        and param.direction in (ast.PARAM_DIRECTION_OUT, ast.PARAM_DIRECTION_INOUT)):
             suffix = '*'
         else:
             suffix = ''
-        if (param.type.is_equiv((ast.TYPE_STRING, ast.TYPE_FILENAME)) and
-            param.transfer == ast.PARAM_TRANSFER_NONE):
+
+        if (param.type.is_equiv((ast.TYPE_STRING, ast.TYPE_FILENAME))
+        and param.transfer == ast.PARAM_TRANSFER_NONE):
             return "const gchar*" + suffix
+
         return param.type.ctype + suffix
 
     def _write_prelude(self, out, func):

data/vendor/local/lib/gobject-introspection/giscanner/collections/__init__.py

@@ -0,0 +1,22 @@
+# -*- Mode: Python -*-
+# GObject-Introspection - a framework for introspecting GObject libraries
+# Copyright (C) 2013 Dieter Verfaillie <dieterv@optionexplicit.be>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+
+
+from .ordereddict import OrderedDict

data/vendor/local/lib/gobject-introspection/giscanner/collections/ordereddict.py

@@ -0,0 +1,120 @@
+# -*- Mode: Python -*-
+# GObject-Introspection - a framework for introspecting GObject libraries
+# Copyright (C) 2008  Johan Dahlin
+# Copyright (C) 2013 Dieter Verfaillie <dieterv@optionexplicit.be>
+#
+# 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.
+
+
+# Borrowed from:
+# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/lib/sqlalchemy/util/_collections.py
+# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/AUTHORS
+#
+# util/_collections.py
+# Copyright (C) 2005-2012 the SQLAlchemy authors and contributors <see AUTHORS file>
+#
+# This module is part of SQLAlchemy and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
+
+
+class OrderedDict(dict):
+    """A dict that returns keys/values/items in the order they were added."""
+
+    def __init__(self, ____sequence=None, **kwargs):
+        self._list = []
+        if ____sequence is None:
+            if kwargs:
+                self.update(**kwargs)
+        else:
+            self.update(____sequence, **kwargs)
+
+    def clear(self):
+        self._list = []
+        dict.clear(self)
+
+    def copy(self):
+        return self.__copy__()
+
+    def __copy__(self):
+        return OrderedDict(self)
+
+    def sort(self, *arg, **kw):
+        self._list.sort(*arg, **kw)
+
+    def update(self, ____sequence=None, **kwargs):
+        if ____sequence is not None:
+            if hasattr(____sequence, 'keys'):
+                for key in ____sequence.keys():
+                    self.__setitem__(key, ____sequence[key])
+            else:
+                for key, value in ____sequence:
+                    self[key] = value
+        if kwargs:
+            self.update(kwargs)
+
+    def setdefault(self, key, value):
+        if key not in self:
+            self.__setitem__(key, value)
+            return value
+        else:
+            return self.__getitem__(key)
+
+    def __iter__(self):
+        return iter(self._list)
+
+    def values(self):
+        return [self[key] for key in self._list]
+
+    def itervalues(self):
+        return iter([self[key] for key in self._list])
+
+    def keys(self):
+        return list(self._list)
+
+    def iterkeys(self):
+        return iter(self.keys())
+
+    def items(self):
+        return [(key, self[key]) for key in self.keys()]
+
+    def iteritems(self):
+        return iter(self.items())
+
+    def __setitem__(self, key, obj):
+        if key not in self:
+            try:
+                self._list.append(key)
+            except AttributeError:
+                # work around Python pickle loads() with
+                # dict subclass (seems to ignore __setstate__?)
+                self._list = [key]
+        dict.__setitem__(self, key, obj)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        self._list.remove(key)
+
+    def pop(self, key, *default):
+        present = key in self
+        value = dict.pop(self, key, *default)
+        if present:
+            self._list.remove(key)
+        return value
+
+    def popitem(self):
+        item = dict.popitem(self)
+        self._list.remove(item[0])
+        return item

data/vendor/local/lib/gobject-introspection/giscanner/docmain.py

@@ -22,8 +22,10 @@ import os
 import optparse
 
 from .docwriter import DocWriter
+from .sectionparser import generate_sections_file, write_sections_file
 from .transformer import Transformer
 
+
 def doc_main(args):
     parser = optparse.OptionParser('%prog [options] GIR-file')
 
@@ -37,6 +39,9 @@ def doc_main(args):
     parser.add_option("", "--add-include-path",
                       action="append", dest="include_paths", default=[],
                       help="include paths for other GIR files")
+    parser.add_option("", "--write-sections-file",
+                      action="store_true", dest="write_sections",
+                      help="Generate and write out a sections file")
 
     options, args = parser.parse_args(args)
     if not options.output:
@@ -54,7 +59,14 @@ def doc_main(args):
     extra_include_dirs.extend(options.include_paths)
     transformer = Transformer.parse_from_gir(args[1], extra_include_dirs)
 
-    writer = DocWriter(transformer, options.language)
-    writer.write(options.output)
+    if options.write_sections:
+        sections_file = generate_sections_file(transformer)
+
+        fp = open(options.output, 'w')
+        write_sections_file(fp, sections_file)
+        fp.close()
+    else:
+        writer = DocWriter(transformer, options.language)
+        writer.write(options.output)
 
     return 0

data/vendor/local/lib/gobject-introspection/giscanner/docwriter.py

@@ -31,6 +31,7 @@ from mako.lookup import TemplateLookup
 from . import ast, xmlwriter
 from .utils import to_underscores
 
+
 def make_page_id(node, recursive=False):
     if isinstance(node, ast.Namespace):
         if recursive:
@@ -51,6 +52,7 @@ def make_page_id(node, recursive=False):
     else:
         return '%s.%s' % (make_page_id(parent, recursive=True), node.name)
 
+
 def get_node_kind(node):
     if isinstance(node, ast.Namespace):
         node_kind = 'namespace'
@@ -78,6 +80,7 @@ def get_node_kind(node):
 
     return node_kind
 
+
 class TemplatedScanner(object):
     def __init__(self, specs):
         self.specs = self.unmangle_specs(specs)
@@ -141,6 +144,7 @@ class TemplatedScanner(object):
         if pos < len(text):
             yield ('other', text[pos:], None)
 
+
 class DocstringScanner(TemplatedScanner):
     def __init__(self):
         specs = [
@@ -156,6 +160,7 @@ class DocstringScanner(TemplatedScanner):
 
         super(DocstringScanner, self).__init__(specs)
 
+
 class DocFormatter(object):
     def __init__(self, transformer):
         self._transformer = transformer
@@ -219,7 +224,7 @@ class DocFormatter(object):
 
         try:
             prop = self._find_thing(type_node.properties, props['property_name'])
-        except (AttributeError, KeyError), e:
+        except (AttributeError, KeyError):
             return match
 
         return self.format_xref(prop)
@@ -231,7 +236,7 @@ class DocFormatter(object):
 
         try:
             signal = self._find_thing(type_node.signals, props['signal_name'])
-        except (AttributeError, KeyError), e:
+        except (AttributeError, KeyError):
             return match
 
         return self.format_xref(signal)
@@ -260,7 +265,7 @@ class DocFormatter(object):
     def _process_parameter(self, node, match, props):
         try:
             parameter = node.get_parameter(props['param_name'])
-        except (AttributeError, ValueError), e:
+        except (AttributeError, ValueError):
             return match
 
         return '<code>%s</code>' % (self.format_parameter_name(node, parameter), )
@@ -358,6 +363,7 @@ class DocFormatter(object):
         parent_chain.reverse()
         return parent_chain
 
+
 class DocFormatterC(DocFormatter):
     language = "C"
     mime_type = "text/x-csrc"
@@ -380,7 +386,7 @@ class DocFormatterC(DocFormatter):
             return getattr(node, 'ctype')
 
     def format_function_name(self, func):
-        if isinstance(func, (ast.Function)):
+        if isinstance(func, ast.Function):
             return func.symbol
         else:
             return func.name
@@ -388,6 +394,7 @@ class DocFormatterC(DocFormatter):
     def get_parameters(self, node):
         return node.all_parameters
 
+
 class DocFormatterIntrospectableBase(DocFormatter):
     def should_render_node(self, node):
         if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None:
@@ -398,6 +405,7 @@ class DocFormatterIntrospectableBase(DocFormatter):
 
         return super(DocFormatterIntrospectableBase, self).should_render_node(node)
 
+
 class DocFormatterPython(DocFormatterIntrospectableBase):
     language = "Python"
     mime_type = "text/python"
@@ -418,7 +426,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
         if getattr(node, "is_method", False):
             return True
 
-        if isinstance(node, (ast.VFunction)):
+        if isinstance(node, ast.VFunction):
             return True
 
         return False
@@ -451,8 +459,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
             "GParam": "GLib.Param",
             "PyObject": "object",
             "GStrv": "[str]",
-            "GVariant": "GLib.Variant",
-            }
+            "GVariant": "GLib.Variant"}
 
         return fundamental_types.get(name, name)
 
@@ -476,6 +483,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
     def get_parameters(self, node):
         return node.all_parameters
 
+
 class DocFormatterGjs(DocFormatterIntrospectableBase):
     language = "Gjs"
     mime_type = "text/x-gjs"
@@ -490,7 +498,7 @@ class DocFormatterGjs(DocFormatterIntrospectableBase):
         if getattr(node, "is_method", False):
             return True
 
-        if isinstance(node, (ast.VFunction)):
+        if isinstance(node, ast.VFunction):
             return True
 
         return False
@@ -514,8 +522,7 @@ class DocFormatterGjs(DocFormatterIntrospectableBase):
             "GParam": "GLib.Param",
             "PyObject": "Object",
             "GStrv": "[String]",
-            "GVariant": "GLib.Variant",
-            }
+            "GVariant": "GLib.Variant"}
 
         return fundamental_types.get(name, name)
 
@@ -558,12 +565,14 @@ class DocFormatterGjs(DocFormatterIntrospectableBase):
                 params.append(param)
         return params
 
+
 LANGUAGES = {
     "c": DocFormatterC,
     "python": DocFormatterPython,
     "gjs": DocFormatterGjs,
 }
 
+
 class DocWriter(object):
     def __init__(self, transformer, language):
         self._transformer = transformer

data/vendor/local/lib/gobject-introspection/giscanner/dumper.py

@@ -89,7 +89,8 @@ class DumpCompiler(object):
         # Enable the --msvc-syntax pkg-config flag when
         # the Microsoft compiler is used
         # (This is the other way to check whether Visual C++ is used subsequently)
-        if 'cl' in self._compiler_cmd:
+        args = self._compiler_cmd.split()
+        if 'cl.exe' in args or 'cl' in args:
             self._pkgconfig_msvc_flags = '--msvc-syntax'
         self._uninst_srcdir = os.environ.get(
             'UNINSTALLED_INTROSPECTION_SRCDIR')
@@ -166,14 +167,14 @@ class DumpCompiler(object):
 
         try:
             self._compile(o_path, c_path)
-        except CompilerError, e:
+        except CompilerError as e:
             if not utils.have_debug_flag('save-temps'):
                 shutil.rmtree(tmpdir)
             raise SystemExit('compilation of temporary binary failed:' + str(e))
 
         try:
             self._link(bin_path, o_path)
-        except LinkerError, e:
+        except LinkerError as e:
             if not utils.have_debug_flag('save-temps'):
                 shutil.rmtree(tmpdir)
             raise SystemExit('linking of temporary binary failed: ' + str(e))
@@ -222,7 +223,7 @@ class DumpCompiler(object):
         # The Microsoft compiler uses different option flags for
         # compilation result output
         if self._pkgconfig_msvc_flags:
-            args.extend(['-c', '-Fe'+output, '-Fo'+output])
+            args.extend(['-c', '-Fe' + output, '-Fo' + output])
         else:
             args.extend(['-c', '-o', output])
         for source in sources:
@@ -236,7 +237,7 @@ class DumpCompiler(object):
             sys.stdout.flush()
         try:
             subprocess.check_call(args)
-        except subprocess.CalledProcessError, e:
+        except subprocess.CalledProcessError as e:
             raise CompilerError(e)
 
     def _link(self, output, *sources):
@@ -253,7 +254,7 @@ class DumpCompiler(object):
         # We can use -o for the Microsoft compiler/linker,
         # but it is considered deprecated usage with that
         if self._pkgconfig_msvc_flags:
-            args.extend(['-Fe'+output])
+            args.extend(['-Fe' + output])
         else:
             args.extend(['-o', output])
         if libtool:
@@ -290,7 +291,7 @@ class DumpCompiler(object):
             sys.stdout.flush()
         try:
             subprocess.check_call(args)
-        except subprocess.CalledProcessError, e:
+        except subprocess.CalledProcessError as e:
             raise LinkerError(e)
 
     def _add_link_internal_args(self, args, libtool):
@@ -312,18 +313,23 @@ class DumpCompiler(object):
                 if self._options.namespace_version:
                     args.append(str.lower(self._options.namespace_name) +
                                 '-' +
-                                self._options.namespace_version+'.lib')
+                                self._options.namespace_version + '.lib')
                 else:
-                    args.append(str.lower(self._options.namespace_name)+'.lib')
+                    args.append(str.lower(self._options.namespace_name) + '.lib')
             else:
                 args.append('-Wl,-rpath=.')
 
+        # Ensure libraries are always linked as we are going to use ldd to work
+        # out their names later
+        if not libtool and self._pkgconfig_msvc_flags == '':
+            args.append('-Wl,--no-as-needed')
+
         for library in self._options.libraries:
             # Visual C++: We have the needed .lib files now, and we need to link
             # to .lib files, not the .dll as the --library option specifies the
             # .dll(s) the .gir file refers to
             if self._pkgconfig_msvc_flags == '':
-                if library.endswith(".la"): # explicitly specified libtool library
+                if library.endswith(".la"):  # explicitly specified libtool library
                     args.append(library)
                 else:
                     args.append('-l' + library)
@@ -352,11 +358,12 @@ class DumpCompiler(object):
             # The --library option on Windows pass in the .dll file(s) the
             # .gir files refer to, so don't link to them on Visual C++
             if self._pkgconfig_msvc_flags == '':
-                if library.endswith(".la"): # explicitly specified libtool library
+                if library.endswith(".la"):  # explicitly specified libtool library
                     args.append(library)
                 else:
                     args.append('-l' + library)
 
+
 def compile_introspection_binary(options, get_type_functions,
                                  error_quark_functions):
     dc = DumpCompiler(options, get_type_functions, error_quark_functions)