diff --git a/pelican/readers.py b/pelican/readers.py index 60fabe82..9b8be192 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -223,10 +223,10 @@ class HTMLReader(Reader): self._data_buffer += self.build_tag(tag, attrs, True) def handle_comment(self, data): - if self._in_body and data.strip() == 'PELICAN_END_SUMMARY': - self.metadata['summary'] = self._data_buffer - else: - self._data_buffer += ''.format(data) + # if self._in_body and data.strip() == 'PELICAN_END_SUMMARY': + # self.metadata['summary'] = self._data_buffer + # else: + self._data_buffer += ''.format(data) def handle_data(self, data): self._data_buffer += data @@ -258,7 +258,7 @@ class HTMLReader(Reader): def read(self, filename): """Parse content and metadata of HTML files""" - with open(filename) as content: + with pelican_open(filename) as content: parser = self._HTMLParser(self.settings) parser.feed(content) parser.close() diff --git a/tests/content/article_with_comments.html b/tests/content/article_with_comments.html index f222682d..289e4a66 100644 --- a/tests/content/article_with_comments.html +++ b/tests/content/article_with_comments.html @@ -1,7 +1,8 @@ + + - Summary comment is not included. - - + Body content + diff --git a/tests/content/article_with_metadata.html b/tests/content/article_with_metadata.html index 2bd77241..b108ac8a 100644 --- a/tests/content/article_with_metadata.html +++ b/tests/content/article_with_metadata.html @@ -5,11 +5,11 @@ + Multi-line metadata should be supported as well as inline markup. - diff --git a/tests/test_readers.py b/tests/test_readers.py index 8cee4c1a..49130669 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -264,25 +264,16 @@ class AdReaderTest(unittest.TestCase): class HTMLReaderTest(unittest.TestCase): def test_article_with_comments(self): reader = readers.HTMLReader({}) - content, metadata = reader.read(_filename('article_with_comments.html')) - expected = { - 'summary': ''' - Summary comment is not included. - ''', - } - - for key, value in expected.items(): - self.assertEquals(value, metadata[key], key) + content, metadata = reader.read(_path('article_with_comments.html')) self.assertEquals(''' - Summary comment is not included. - - + Body content + ''', content) def test_article_with_keywords(self): reader = readers.HTMLReader({}) - content, metadata = reader.read(_filename('article_with_keywords.html')) + content, metadata = reader.read(_path('article_with_keywords.html')) expected = { 'tags': ['foo', 'bar', 'foobar'], } @@ -292,15 +283,12 @@ class HTMLReaderTest(unittest.TestCase): def test_article_with_metadata(self): reader = readers.HTMLReader({}) - content, metadata = reader.read(_filename('article_with_metadata.html')) + content, metadata = reader.read(_path('article_with_metadata.html')) expected = { 'category': 'yeah', 'author': u'Alexis Métaireau', 'title': 'This is a super article !', - 'summary': u''' - Multi-line metadata should be supported - as well as inline markup. - ''', + 'summary': u'''Summary and stuff''', 'date': datetime.datetime(2010, 12, 2, 10, 14), 'tags': ['foo', 'bar', 'foobar'], 'custom_field': 'http://notmyidea.org', @@ -313,6 +301,6 @@ class HTMLReaderTest(unittest.TestCase): def test_article_metadata_key_lowercase(self): """Keys of metadata should be lowercase.""" reader = readers.HTMLReader({}) - content, metadata = reader.read(_filename('article_with_uppercase_metadata.html')) + content, metadata = reader.read(_path('article_with_uppercase_metadata.html')) self.assertIn('category', metadata, "Key should be lowercase.") self.assertEquals('Yeah', metadata.get('category'), "Value keeps cases.")