github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 35c0909e8b into 9e526a825e

Browse source
This commit is contained in:
Haridas N 2018-09-18 17:26:23 +00:00 • committed by GitHub
commit e9ff317ef4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pelican/readers.py
View file

@ -21,10 +21,7 @@ from pelican.contents import Author, Category, Page, Tag
from pelican.utils import SafeDatetime, escape_html, get_date, pelican_open, \
posixize_path
try:
from markdown import Markdown
except ImportError:
Markdown = False # NOQA
from markdown import Markdown # NOQA
# Metadata processors have no way to discard an unwanted value, so we have
# them return this value instead to signal that it should be discarded later.

2
setup.py
View file

@ -7,7 +7,7 @@ from os.path import join, relpath
from setuptools import setup
requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments', 'docutils',
'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4',
'pytz >= 0a', 'blinker', 'unidecode', 'six >= 1.4', 'markdown',
'python-dateutil']
entry_points = {