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

Unit test failed due to missing trailing comma in tuple. Fixed.

Browse source
This commit is contained in:
Matt Bowcock 2012-04-10 00:32:01 -04:00
commit d4e632dfa8
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pelican/readers.py
View file

@ -65,11 +65,7 @@ def render_node_to_html(document, node):
class RstReader(Reader): class RstReader(Reader):
enabled = bool(docutils) enabled = bool(docutils)
<<<<<<< HEAD
extension = "rst"
=======
extension = ['rst'] extension = ['rst']
>>>>>>> f1de695... Add support for multiple file extensions per file reader.
def _parse_metadata(self, document): def _parse_metadata(self, document):
"""Return the dict containing document metadata""" """Return the dict containing document metadata"""
@ -115,11 +111,7 @@ class RstReader(Reader):
class MarkdownReader(Reader): class MarkdownReader(Reader):
enabled = bool(Markdown) enabled = bool(Markdown)
<<<<<<< HEAD
extension = "md"
=======
extension = ['md', 'markdown', 'mkd'] extension = ['md', 'markdown', 'mkd']
>>>>>>> f1de695... Add support for multiple file extensions per file reader.
extensions = ['codehilite', 'extra'] extensions = ['codehilite', 'extra']
def read(self, filename): def read(self, filename):
@ -136,11 +128,7 @@ class MarkdownReader(Reader):
class HtmlReader(Reader): class HtmlReader(Reader):
<<<<<<< HEAD
extension = "html"
=======
extension = ['html', 'htm'] extension = ['html', 'htm']
>>>>>>> f1de695... Add support for multiple file extensions per file reader.
_re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>') _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
def read(self, filename): def read(self, filename):