mirror of
https://github.com/getpelican/pelican.git
synced 2025-10-15 20:28:56 +02:00
Python-Markdown quote's URL's, we need to unquote to use on filesystem
Fixes #1143 Closes #1095 Closes #1149
This commit is contained in:
parent
e10fe42928
commit
da690dfc37
2 changed files with 30 additions and 0 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
from __future__ import unicode_literals, print_function
|
from __future__ import unicode_literals, print_function
|
||||||
import six
|
import six
|
||||||
|
from six.moves.urllib.parse import unquote
|
||||||
|
|
||||||
import copy
|
import copy
|
||||||
import locale
|
import locale
|
||||||
|
|
@ -215,6 +216,12 @@ class Content(object):
|
||||||
os.path.join(self.relative_dir, path)
|
os.path.join(self.relative_dir, path)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if path not in self._context['filenames']:
|
||||||
|
unquoted_path = path.replace('%20', ' ')
|
||||||
|
|
||||||
|
if unquoted_path in self._context['filenames']:
|
||||||
|
path = unquoted_path
|
||||||
|
|
||||||
if path in self._context['filenames']:
|
if path in self._context['filenames']:
|
||||||
origin = '/'.join((siteurl,
|
origin = '/'.join((siteurl,
|
||||||
self._context['filenames'][path].url))
|
self._context['filenames'][path].url))
|
||||||
|
|
|
||||||
|
|
@ -323,6 +323,29 @@ class TestPage(unittest.TestCase):
|
||||||
'<blockquote cite="http://notmyidea.org/reference.html">blah blah</blockquote>'
|
'<blockquote cite="http://notmyidea.org/reference.html">blah blah</blockquote>'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_intrasite_link_markdown_spaces(self):
|
||||||
|
# Markdown introduces %20 instead of spaces, this tests that
|
||||||
|
# we support markdown doing this.
|
||||||
|
cls_name = '_DummyArticle' if six.PY3 else b'_DummyArticle'
|
||||||
|
article = type(cls_name, (object,), {'url': 'article-spaces.html'})
|
||||||
|
|
||||||
|
args = self.page_kwargs.copy()
|
||||||
|
args['settings'] = get_settings()
|
||||||
|
args['source_path'] = 'content'
|
||||||
|
args['context']['filenames'] = {'article spaces.rst': article}
|
||||||
|
|
||||||
|
# An intrasite link via filename with %20 as a space
|
||||||
|
args['content'] = (
|
||||||
|
'A simple test, with a '
|
||||||
|
'<a href="|filename|article%20spaces.rst">link</a>'
|
||||||
|
)
|
||||||
|
content = Page(**args).get_content('http://notmyidea.org')
|
||||||
|
self.assertEqual(
|
||||||
|
content,
|
||||||
|
'A simple test, with a '
|
||||||
|
'<a href="http://notmyidea.org/article-spaces.html">link</a>'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestArticle(TestPage):
|
class TestArticle(TestPage):
|
||||||
def test_template(self):
|
def test_template(self):
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue