You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by gc...@apache.org on 2022/10/27 16:57:45 UTC
[allura] branch gc/8474 updated (89ff1015f -> 3f7b908a4)
This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a change to branch gc/8474
in repository https://gitbox.apache.org/repos/asf/allura.git
from 89ff1015f SF-7807 Upgrade testfixtures 6.18.5 -> 7.0.0
new 86945a7cb [#8474] emojize argument update
new 3f7b908a4 [#8474] pinned Markdown to 3.3.7
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Allura/allura/lib/helpers.py | 2 +-
Allura/allura/lib/markdown_extensions.py | 2 +-
Allura/allura/lib/utils.py | 2 +-
requirements.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[allura] 01/02: [#8474] emojize argument update
Posted by gc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a commit to branch gc/8474
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 86945a7cb532304c3b96f1f97553789384732416
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Thu Oct 27 10:52:16 2022 -0600
[#8474] emojize argument update
---
Allura/allura/lib/helpers.py | 2 +-
Allura/allura/lib/markdown_extensions.py | 2 +-
Allura/allura/lib/utils.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 2efce7911..da5f3e954 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -1288,7 +1288,7 @@ def hide_private_info(message):
def emojize(text):
"""Coverts emoji codes to unicode emojis"""
- return emoji.emojize(text, use_aliases=True)
+ return emoji.emojize(text, language="alias")
def get_current_reaction(react_users_dict):
diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py
index b929a6b7a..c1d089d77 100644
--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -311,7 +311,7 @@ class EmojiInlinePattern(markdown.inlinepatterns.Pattern):
def handleMatch(self, m):
emoji_code = m.group(2)
- return emoji.emojize(emoji_code, use_aliases=True)
+ return emoji.emojize(emoji_code, language="alias")
class UserMentionExtension(markdown.Extension):
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index b6e7ee0de..41b2c979f 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -761,7 +761,7 @@ def get_reactions_json():
""" Returns global reactions json """
j = OrderedDict()
for em in get_reaction_emoji_list():
- j[em] = emoji.emojize(em, use_aliases=True)
+ j[em] = emoji.emojize(em, language='alias')
return json.dumps(j)
[allura] 02/02: [#8474] pinned Markdown to 3.3.7
Posted by gc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a commit to branch gc/8474
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 3f7b908a42f93cc21c31beef367c7c5866ab40df
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Thu Oct 27 10:57:39 2022 -0600
[#8474] pinned Markdown to 3.3.7
---
requirements.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.in b/requirements.in
index 972f42ebf..2d3fae1a3 100644
--- a/requirements.in
+++ b/requirements.in
@@ -14,7 +14,7 @@ FormEncode
GitPython
html5lib
Jinja2
-Markdown
+Markdown==3.3.7
markdown-checklist
MarkupSafe!=2.1.1
Ming