Prepare the Signature Module For More Applications

This is the preparation for a number of planned applications
and extensions using the signature module.
This general overhaul contains:

- Extraction of signature enumerations into enum_sigs.py,

- a list of current keyword errors in arguments which are unsolved
  in shiboken, but temporarily fixed in parser.py (too many for XML),

- fix spurious duplications in multiple signatures

- corrections for keyword errors in function names which cannot be
  fixed by Python (quite few),

- fixing "..." arguments into "*args",

- supporting the "slot wrapper" type. This is necessary for
  methods like "__add__", "__mul__" etc.

- Create an extra function "get_signature" that has a parameter to
  modify the appearance, i.e. without self, without returntype, etc.

Task-number: PYSIDE-510
Change-Id: If16f7bf02c6e7cbbdc970058bb630ea4db2b854a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 4 insertions, 86 deletions

diff --git a/sources/pyside2/tests/registry/init_platform.py b/sources/pyside2/tests/registry/init_platform.py
index 03d0ed133..22875a63e 100644
--- a/sources/pyside2/tests/registry/init_platform.py
+++ b/sources/pyside2/tests/registry/init_platform.py
@@ -55,9 +55,10 @@ from textwrap import dedent
 
 all_modules = list("PySide2." + x for x in PySide2.__all__)
 
-from PySide2.support.signature import inspect
 from PySide2.QtCore import __version__
 
+from PySide2.support.signature.lib.enum_sig import SimplifyingEnumerator
+
 is_py3 = sys.version_info[0] == 3
 is_ci = os.environ.get("QTEST_ENVIRONMENT", "") == "ci"
 # Python2 legacy: Correct 'linux2' to 'linux', recommended way.
@@ -114,7 +115,7 @@ class Formatter(object):
     Formatter is formatting the signature listing of an enumerator.
 
     It is written as context managers in order to avoid many callbacks.
-    The division in formatter and enumerator is done to keep the
+    The separation in formatter and enumerator is done to keep the
     unrelated tasks of enumeration and formatting apart.
     """
     def __init__(self, outfile):
@@ -134,7 +135,7 @@ class Formatter(object):
         self.print("    })")
 
     @contextmanager
-    def klass(self, class_name):
+    def klass(self, class_name, class_str):
         self.class_name = class_name
         self.print()
         self.print("    # class {}.{}:".format(self.mod_name, class_name))
@@ -152,89 +153,6 @@ class Formatter(object):
         yield key
 
 
-class ExactEnumerator(object):
-    """
-    ExactEnumerator enumerates all signatures in a module as they are.
-
-    This class is used for generating complete listings of all signatures.
-    An appropriate formatter should be supplied, if printable output
-    is desired.
-    """
-    def __init__(self, formatter, result_type=dict):
-        self.fmt = formatter
-        self.result_type = result_type
-
-    def module(self, mod_name):
-        __import__(mod_name)
-        with self.fmt.module(mod_name):
-            module = sys.modules[mod_name]
-            members = inspect.getmembers(module, inspect.isclass)
-            ret = self.result_type()
-            for class_name, klass in members:
-                ret.update(self.klass(class_name, klass))
-            return ret
-
-    def klass(self, class_name, klass):
-        with self.fmt.klass(class_name):
-            ret = self.function("__init__", klass)
-            # class_members = inspect.getmembers(klass)
-            # gives us also the inherited things.
-            class_members = sorted(list(klass.__dict__.items()))
-            for func_name, func in class_members:
-                ret.update(self.function(func_name, func))
-            return ret
-
-    def function(self, func_name, func):
-        ret = self.result_type()
-        signature = getattr(func, '__signature__', None)
-        if signature is not None:
-            with self.fmt.function(func_name, signature) as key:
-                ret[key] = signature
-        return ret
-
-
-def simplify(signature):
-    if isinstance(signature, list):
-        # remove duplicates which still sometimes occour:
-        ret = set(simplify(sig) for sig in signature)
-        return sorted(ret) if len(ret) > 1 else list(ret)[0]
-    ret = []
-    for pv in signature.parameters.values():
-        txt = str(pv)
-        if txt == "self":
-            continue
-        txt = txt[txt.index(":") + 1:]
-        if "=" in txt:
-            txt = txt[:txt.index("=")]
-        quote = txt[0]
-        if quote in ("'", '"') and txt[-1] == quote:
-            txt = txt[1:-1]
-        ret.append(txt)
-    return tuple(ret)
-
-
-class SimplifyingEnumerator(ExactEnumerator):
-    """
-    SimplifyingEnumerator enumerates all signatures in a module filtered.
-
-    There are no default values, no variable
-    names and no self parameter. Only types are present after simplification.
-    The functions 'next' resp. '__next__' are removed
-    to make the output identical for Python 2 and 3.
-    An appropriate formatter should be supplied, if printable output
-    is desired.
-    """
-
-    def function(self, func_name, func):
-        ret = self.result_type()
-        signature = getattr(func, '__signature__', None)
-        sig = simplify(signature) if signature is not None else None
-        if sig is not None and func_name not in ("next", "__next__"):
-            with self.fmt.function(func_name, sig) as key:
-                ret[key] = sig
-        return ret
-
-
 def enum_all():
     fmt = Formatter(None)
     enu = SimplifyingEnumerator(fmt)