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 780fa38b7a into 661ee49eda

Browse source
This commit is contained in:
Rúnar Berg Baugsson Sigríðarson 2015-10-12 08:13:56 +00:00
commit 54a1672ffd
13 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pelican/readers.py
View file

@ -379,7 +379,11 @@ class HTMLReader(BaseReader):
for k, v in attrs:
result += ' ' + escape(k)
if v is not None:
result += '="{}"'.format(escape(v))
# figure out the proper surrounding quote-marks
if '"' in v:
result += "='{}'".format(escape(v))
else:
result += '="{}"'.format(escape(v))
if close_tag:
return result + ' />'
return result + '>'

12
pelican/tests/content/article_with_attributes.html Normal file
View file

@ -0,0 +1,12 @@
<html>
<head>
</head>
<body>
<section id="double-quote-attribute-value">
Both double quoted attribute values should
be supported.
As well as single quoted, so they can accept some
<span data-json='{"key": "value"}'>JSON data-attributes</span>
</section>
</body>
</html>

2
pelican/tests/output/basic/feeds/all-en.atom.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/basic/feeds/all.atom.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/basic/feeds/misc.atom.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/basic/unbelievable.html
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/custom/feeds/all-en.atom.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/custom/feeds/all.atom.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/custom/feeds/all.rss.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/custom/feeds/misc.atom.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/custom/feeds/misc.rss.xml
View file

File diff suppressed because one or more lines are too long

2
pelican/tests/output/custom/unbelievable.html
View file

File diff suppressed because one or more lines are too long

12
pelican/tests/test_readers.py
View file

@ -579,6 +579,18 @@ class HTMLReaderTest(ReaderTest):
}
self.assertDictHasSubset(page.metadata, expected)
def test_article_with_attributes(self):
page = self.read_file(path='article_with_attributes.html')
self.assertEqual('''
<section id="double-quote-attribute-value">
Both double quoted attribute values should
be supported.
As well as single quoted, so they can accept some
<span data-json='{"key": "value"}'>JSON data-attributes</span>
</section>
''', page.content)
def test_article_with_null_attributes(self):
page = self.read_file(path='article_with_null_attributes.html')