aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-02-11 23:02:26 +1100
committerNeil <nyamatongwe@gmail.com>2021-02-11 23:02:26 +1100
commit375509a3cff648acd57c8b975921ebc37b1878ba (patch)
treecb0595a3711cc29259bfdd54d0b6db1b54163343
parent5cdcdc0f01f8fcee4f0caac755b78a246c815364 (diff)
downloadscintilla-mirror-375509a3cff648acd57c8b975921ebc37b1878ba.tar.gz
Make merging of Scintilla and Lexilla features work on older versions of Python.
-rw-r--r--test/XiteQt.py2
-rw-r--r--test/XiteWin.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/XiteQt.py b/test/XiteQt.py
index 30e6c8b23..e91829ad0 100644
--- a/test/XiteQt.py
+++ b/test/XiteQt.py
@@ -53,7 +53,7 @@ class XiteWin():
try:
faceLex = Face.Face()
faceLex.ReadFromFile(os.path.join(lexillaIncludeDirectory, "LexicalStyles.iface"))
- self.face.features = {**self.face.features, **faceLex.features}
+ self.face.features.update(faceLex.features)
except FileNotFoundError:
print("Can't find " + "LexicalStyles.iface")
diff --git a/test/XiteWin.py b/test/XiteWin.py
index 662bff370..c71db04bb 100644
--- a/test/XiteWin.py
+++ b/test/XiteWin.py
@@ -165,7 +165,7 @@ class XiteWin():
try:
faceLex = Face.Face()
faceLex.ReadFromFile(os.path.join(lexillaIncludeDirectory, "LexicalStyles.iface"))
- self.face.features = {**self.face.features, **faceLex.features}
+ self.face.features.update(faceLex.features)
except FileNotFoundError:
print("Can't find " + "LexicalStyles.iface")