From 9382b01a2f6ff8ff294fe73f2d27b24f5c8dfb3c Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Sat, 25 Aug 2018 17:06:06 +0200 Subject: Make signature module unconditional After the signature module has been around for quite a while, there is no longer a reason to leave it optional. At the same time, we set the minimum Python 3 version to 3.5 . Some comments are reworked as well, but nothing real changed. Task-number: PYSIDE-510 Change-Id: I9e960f390d507d24bb45f7028838755fe23e751d Reviewed-by: Friedemann Kleint --- .../pyside2/PySide2/support/signature/loader.py | 13 +++++++---- .../pyside2/PySide2/support/signature/mapping.py | 2 +- .../pyside2/PySide2/support/signature/parser.py | 27 ++++++++++++---------- 3 files changed, 25 insertions(+), 17 deletions(-) (limited to 'sources/pyside2') diff --git a/sources/pyside2/PySide2/support/signature/loader.py b/sources/pyside2/PySide2/support/signature/loader.py index 1827ca454..984e738df 100644 --- a/sources/pyside2/PySide2/support/signature/loader.py +++ b/sources/pyside2/PySide2/support/signature/loader.py @@ -40,13 +40,18 @@ from __future__ import print_function, absolute_import """ +loader.py + +The loader has to lazy-load the signature module and also provides a few +Python modules to support Python 2.7 . + This file was originally directly embedded into the C source. After it grew more and more, I now prefer to have it as Python file. -The remaining stub loader is a short string now. +The remaining stub loader in the C source is now only a short string. -The loader has to lazy-load the signature module and also provides a few -Python modules that I consider essential and therefore built-in. -This version does not use an embedded .zip file. +This version does no longer use an embedded .zip file but is a package. +The old code without a package but with zip compression can still be found +at https://codereview.qt-project.org/#/c/203533/ for reference. """ import sys diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py index 7151af8bb..dd3df0988 100644 --- a/sources/pyside2/PySide2/support/signature/mapping.py +++ b/sources/pyside2/PySide2/support/signature/mapping.py @@ -40,7 +40,7 @@ from __future__ import print_function, absolute_import """ -signature_mapping.py +mapping.py This module has the mapping from the pyside C-modules view of signatures to the Python representation. diff --git a/sources/pyside2/PySide2/support/signature/parser.py b/sources/pyside2/PySide2/support/signature/parser.py index eb6453d3e..9313fb540 100644 --- a/sources/pyside2/PySide2/support/signature/parser.py +++ b/sources/pyside2/PySide2/support/signature/parser.py @@ -49,21 +49,24 @@ from .mapping import type_map, update_mapping, __dict__ as namespace _DEBUG = False -TYPE_MAP_DOC = """ - The type_map variable is central for the signature package. +""" +parser.py + +This module parses the signature text and creates properties for the +signature objects. - PySide has a new function 'CppGenerator::writeSignatureInfo()' - that extracts the gathered information about the function arguments - and defaults as good as it can. But what PySide generates is still - very C-ish and has many constants that Python doesn't understand. +PySide has a new function 'CppGenerator::writeSignatureInfo()' +that extracts the gathered information about the function arguments +and defaults as good as it can. But what PySide generates is still +very C-ish and has many constants that Python doesn't understand. - The function 'try_to_guess()' below understands a lot of PySide's - peculiar way to assume local context. If it is able to do the guess, - then the result is inserted into the dict, so the search happens - not again. For everything that is not covered by these automatic - guesses, we provide an entry in 'type_map' that resolves it. +The function 'try_to_guess()' below understands a lot of PySide's +peculiar way to assume local context. If it is able to do the guess, +then the result is inserted into the dict, so the search happens +not again. For everything that is not covered by these automatic +guesses, we provide an entry in 'type_map' that resolves it. - In effect, 'type_map' maps text to real Python objects. +In effect, 'type_map' maps text to real Python objects. """ def dprint(*args, **kw): -- cgit v1.2.3