From 0ad2cba1925c5286e95e4bfa25a534ad3d2b56c8 Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Sat, 10 Dec 2022 18:12:01 +0100 Subject: [PATCH] remplaced markdown2 by markdown module --- cao_blogr/services/blog_record.py | 2 +- cao_blogr/templates/blog_edit.jinja2 | 3 ++- cao_blogr/templates/home.jinja2 | 2 +- cao_blogr/templates/layout.jinja2 | 18 +++++++++--------- cao_blogr/views/blog.py | 10 ++++------ cao_blogr/views/default.py | 6 +++--- setup.py | 2 +- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/cao_blogr/services/blog_record.py b/cao_blogr/services/blog_record.py index 5348d01..aa361f5 100644 --- a/cao_blogr/services/blog_record.py +++ b/cao_blogr/services/blog_record.py @@ -38,7 +38,7 @@ class BlogRecordService(object): @classmethod def get_last_created(cls, request): - # gest the last created posts + # gest the 10 last created posts query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id != '_admin') if request.authenticated_userid == None: # if user is anonym, display only published posts diff --git a/cao_blogr/templates/blog_edit.jinja2 b/cao_blogr/templates/blog_edit.jinja2 index 05407f7..4f656b5 100644 --- a/cao_blogr/templates/blog_edit.jinja2 +++ b/cao_blogr/templates/blog_edit.jinja2 @@ -56,7 +56,8 @@ {% endif %} -

Apprendre la syntaxe de Markdown

+

Apprendre la syntaxe de Markdown

diff --git a/cao_blogr/templates/home.jinja2 b/cao_blogr/templates/home.jinja2 index 332424a..428be67 100644 --- a/cao_blogr/templates/home.jinja2 +++ b/cao_blogr/templates/home.jinja2 @@ -113,7 +113,7 @@
PAGES RECENTES - CÁC BÀI MỚI
- {% for entry in last_five %} + {% for entry in last_ten %}
{{ entry.created.strftime("%d.%m.%Y") }} diff --git a/cao_blogr/templates/layout.jinja2 b/cao_blogr/templates/layout.jinja2 index 9d5e2e8..e8f8474 100644 --- a/cao_blogr/templates/layout.jinja2 +++ b/cao_blogr/templates/layout.jinja2 @@ -119,15 +119,15 @@

Les sites SUNYATA dans le monde

diff --git a/cao_blogr/views/blog.py b/cao_blogr/views/blog.py index 9da689a..f6e7630 100644 --- a/cao_blogr/views/blog.py +++ b/cao_blogr/views/blog.py @@ -1,6 +1,6 @@ from pyramid.view import view_config from pyramid.httpexceptions import HTTPNotFound, HTTPFound -from markdown2 import Markdown +import markdown import datetime #<- will be used to set default dates on models from ..models.blog_record import BlogRecord @@ -20,9 +20,8 @@ def blog(request): # insèrer le path de static/img body = entry.body.replace('static/', "%s/static/" % request.application_url) - # convertir mardown en HTML - markdowner = Markdown() - body_html = markdowner.convert(body) + # convertir de markdown en HTML + body_html = markdown.markdown(body, extensions=['footnotes']) return { 'page_title': entry.title, @@ -172,8 +171,7 @@ def topic(request): # get the topic record topic_record = BlogRecordService.get_topic_byTopic(request, topic) # convertir champ topic_quote en HTML - markdowner = Markdown() - topic_quote = markdowner.convert(topic_record.topic_quote) + topic_quote = markdown.markdown(topic_record.topic_quote) # insèrer le path de static/img topic_quote = topic_quote.replace('static/', "%s/static/" % request.application_url) diff --git a/cao_blogr/views/default.py b/cao_blogr/views/default.py index 5a9a64e..864b017 100644 --- a/cao_blogr/views/default.py +++ b/cao_blogr/views/default.py @@ -43,7 +43,7 @@ def home(request): # insèrer le path de static/img activities = activ.body.replace('static/', "%s/static/" % request.application_url) # get the last created posts - last_five = BlogRecordService.get_last_created(request) + last_ten = BlogRecordService.get_last_created(request) name = '' email = '' comments = '' @@ -81,7 +81,7 @@ def home(request): return { 'page_title': "", - 'last_five': last_five, + 'last_ten': last_ten, 'activities': activities, 'car_images': car_images, 'name': name, @@ -121,7 +121,7 @@ def settings(request): # informations sur les versions pyramid_version = pkg_resources.get_distribution("pyramid").version wtforms_version = pkg_resources.get_distribution("wtforms").version - markdown_version = pkg_resources.get_distribution("markdown2").version + markdown_version = pkg_resources.get_distribution("markdown").version sqlalchemy_version = pkg_resources.get_distribution("sqlalchemy").version sqlite_version = sqlite3.sqlite_version python_version = sys.version diff --git a/setup.py b/setup.py index b04539b..1475896 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ requires = [ 'python-magic', 'Pillow == 6.1.0', 'unidecode', - 'markdown2', + 'markdown', 'urllib', ]