indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Joining dictionaries

merge-requests/30/head
Bob Mottram 2021-11-01 22:56:09 +00:00
parent 570937d8f7
commit 259f4eadda
1 changed files with 1 additions and 1 deletions

2
content.py
View File

@ -906,7 +906,7 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
loadJson(baseDir + '/emojicustom/emoji.json') loadJson(baseDir + '/emojicustom/emoji.json')
if customEmojiDict: if customEmojiDict:
emojiDict = \ emojiDict = \
dict(emojiDict.items() + customEmojiDict.items()) dict(emojiDict, **customEmojiDict)
# print('TAG: looking up emoji for :' + wordStr2 + ':') # print('TAG: looking up emoji for :' + wordStr2 + ':')
_addEmoji(baseDir, ':' + wordStr2 + ':', httpPrefix, _addEmoji(baseDir, ':' + wordStr2 + ':', httpPrefix,