diff options
author | Christian Tismer <tismer@stackless.com> | 2020-11-02 12:50:00 +0100 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2020-11-02 13:26:38 +0000 |
commit | 6e3e7b9ca0548430aaa5e2555d6e02c64625fa3f (patch) | |
tree | a821c90747c2376d1396a4bf58330f8b41ccbaad /sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib | |
parent | 4544a943ca2df4e6f0ac24914f0c0f844dc6f748 (diff) |
replace **locals by f-strings where possible
This change affects mostly only my own sources which were
prepared for the migration to Python 3.6 .
Task-number: PYSIDE-904
Change-Id: I0c2cd59f6f625f51f876099c33005ac70ca39db9
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib')
-rw-r--r-- | sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py | 3 | ||||
-rw-r--r-- | sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py index 371b3ca4a..dcbdd657c 100644 --- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py +++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py @@ -147,8 +147,7 @@ class ExactEnumerator(object): if klass == subclass: # this is a side effect of the typing module for Python 2.7 # via the "._gorg" property, which we can safely ignore. - print("Warning: {class_name} points to itself via {subclass_name}, skipped!" - .format(**locals())) + print(f"Warning: {class_name} points to itself via {subclass_name}, skipped!") continue ret.update(self.klass(subclass_name, subclass)) self.fmt.class_name = class_name diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py index 24e75e42c..6d72fa5db 100644 --- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py +++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/tool.py @@ -106,8 +106,8 @@ def build_brace_pattern(level, separators=""): ro, rc, so, sc, co, cc, ao, ac, separators, qu, bs, all = map( escape, (ro, rc, so, sc, co, cc, ao, ac, separators, qu, bs, all)) - no_brace_sep_q = r"[^{all}{separators}{qu}{bs}]".format(**locals()) - no_quote = r"(?: [^{qu}{bs}] | {bs}. )*".format(**locals()) + no_brace_sep_q = fr"[^{all}{separators}{qu}{bs}]" + no_quote = fr"(?: [^{qu}{bs}] | {bs}. )*" pattern = dedent(r""" ( (?: {__} {no_brace_sep_q} @@ -119,7 +119,7 @@ def build_brace_pattern(level, separators=""): )+ ) """) - no_braces_q = "[^{all}{qu}{bs}]*".format(**locals()) + no_braces_q = f"[^{all}{qu}{bs}]*" repeated = dedent(r""" {indent} (?: {__} {no_braces_q} {indent} | {qu} {no_quote} {qu} |