diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-27 14:20:36 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-27 14:20:36 +0200 |
commit | 25f899e276c00b8d7f334819d6cd7927ed67093a (patch) | |
tree | d2a063aab76e0435eb862ca5d2b541a5e718f062 /sources/pyside2/PySide2/support | |
parent | 4725008aeea407ae55cfd66de802dd9e06412efc (diff) | |
parent | e30e0c161b2b4d50484314bf006e9e5e8ff6b380 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I94cb5a7dab97cff3591bac534228bfd3e3ad5938
Diffstat (limited to 'sources/pyside2/PySide2/support')
-rw-r--r-- | sources/pyside2/PySide2/support/signature/inspect.py | 5 | ||||
-rw-r--r-- | sources/pyside2/PySide2/support/signature/mapping.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sources/pyside2/PySide2/support/signature/inspect.py b/sources/pyside2/PySide2/support/signature/inspect.py index b59368229..cae96bc16 100644 --- a/sources/pyside2/PySide2/support/signature/inspect.py +++ b/sources/pyside2/PySide2/support/signature/inspect.py @@ -1238,9 +1238,10 @@ def getargvalues(frame): args, varargs, varkw = getargs(frame.f_code) return ArgInfo(args, varargs, varkw, frame.f_locals) +# This function is changed because we use a local copy of typing def formatannotation(annotation, base_module=None): - if getattr(annotation, '__module__', None) == 'typing': - return repr(annotation).replace('typing.', '') + if getattr(annotation, '__module__', None) == 'PySide2.support.signature.typing': + return repr(annotation).replace('PySide2.support.signature.typing.', '') if isinstance(annotation, type): if annotation.__module__ in ('builtins', base_module): return annotation.__qualname__ diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py index c9a028dd2..a03abc08d 100644 --- a/sources/pyside2/PySide2/support/signature/mapping.py +++ b/sources/pyside2/PySide2/support/signature/mapping.py @@ -109,13 +109,13 @@ class Reloader(object): if self.sys_module_count == len(sys.modules): return self.sys_module_count = len(sys.modules) + g = globals() for mod_name in self.uninitialized[:]: if "PySide2." + mod_name in sys.modules: self.uninitialized.remove(mod_name) proc_name = "init_" + mod_name - if proc_name in globals(): - init_proc = globals()[proc_name] - globals().update(init_proc()) + if proc_name in g: + g.update(g[proc_name]()) update_mapping = Reloader().update type_map = {} |