From 5d6513c36cb7cb16a97d21e7abe0108fbdd95557 Mon Sep 17 00:00:00 2001 From: Annika Backstrom Date: Wed, 23 Nov 2016 00:13:28 -0500 Subject: [PATCH 1/7] Skip Markdown metadata parsing within metadata --- pelican/readers.py | 3 +++ .../article_with_markdown_and_nested_metadata.md | 5 +++++ pelican/tests/test_generators.py | 3 +++ pelican/tests/test_readers.py | 13 +++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 pelican/tests/content/article_with_markdown_and_nested_metadata.md diff --git a/pelican/readers.py b/pelican/readers.py index 673b637e..dea11fbd 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -302,6 +302,9 @@ class MarkdownReader(BaseReader): """Return the dict containing document metadata""" formatted_fields = self.settings['FORMATTED_FIELDS'] + # prevent metadata extraction in fields + self._md.preprocessors.pop('meta', None) + output = {} for name, value in meta.items(): name = name.lower() diff --git a/pelican/tests/content/article_with_markdown_and_nested_metadata.md b/pelican/tests/content/article_with_markdown_and_nested_metadata.md new file mode 100644 index 00000000..3968027b --- /dev/null +++ b/pelican/tests/content/article_with_markdown_and_nested_metadata.md @@ -0,0 +1,5 @@ +Title: Article with markdown and nested summary metadata +Date: 2012-10-30 +Summary: Test: This metadata value looks like metadata + +This is some content. diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py index 3ab341a3..1f8157a6 100644 --- a/pelican/tests/test_generators.py +++ b/pelican/tests/test_generators.py @@ -239,6 +239,8 @@ class TestArticlesGenerator(unittest.TestCase): ['Article title', 'published', 'Default', 'article'], ['Article with markdown and summary metadata multi', 'published', 'Default', 'article'], + ['Article with markdown and nested summary metadata', 'published', + 'Default', 'article'], ['Article with markdown and summary metadata single', 'published', 'Default', 'article'], ['Article with markdown containing footnotes', 'published', @@ -554,6 +556,7 @@ class TestArticlesGenerator(unittest.TestCase): 'Article title', 'Article with Nonconformant HTML meta tags', 'Article with an inline SVG', + 'Article with markdown and nested summary metadata', 'Article with markdown and summary metadata multi', 'Article with markdown and summary metadata single', 'Article with markdown containing footnotes', diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py index 5b87aeac..70e6da77 100644 --- a/pelican/tests/test_readers.py +++ b/pelican/tests/test_readers.py @@ -645,6 +645,19 @@ class MdReaderTest(ReaderTest): } self.assertDictHasSubset(metadata, expected) + def test_metadata_not_parsed_for_metadata(self): + settings = get_settings() + settings['FORMATTED_FIELDS'] = ['summary'] + + reader = readers.MarkdownReader(settings=settings) + content, metadata = reader.read( + _path('article_with_markdown_and_nested_metadata.md')) + expected = { + 'title': 'Article with markdown and nested summary metadata', + 'summary': '

Test: This metadata value looks like metadata

', + } + self.assertDictHasSubset(metadata, expected) + def test_empty_file(self): reader = readers.MarkdownReader(settings=get_settings()) content, metadata = reader.read( From e618becfc08934a7813b8a9832ae5105c07d0595 Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Sun, 12 Apr 2020 11:37:10 +0200 Subject: [PATCH 2/7] Skip MD metadata parsing in latest Python-Markdown The syntax for unloading Python-Markdown extensions has changed to a "deregister" method on Registry objects. --- pelican/readers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pelican/readers.py b/pelican/readers.py index dea11fbd..6d9923f2 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -303,7 +303,7 @@ class MarkdownReader(BaseReader): formatted_fields = self.settings['FORMATTED_FIELDS'] # prevent metadata extraction in fields - self._md.preprocessors.pop('meta', None) + self._md.preprocessors.deregister('meta') output = {} for name, value in meta.items(): From 2a5bb109ba3ce0910b5e4ca3a19313c564f2017a Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Sun, 12 Apr 2020 15:04:22 +0200 Subject: [PATCH 3/7] Pin pytest until 5.4.x series has stabilized Version 5.4.1 is currently incompatible with pytest-sugar. --- requirements/test.pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.pip b/requirements/test.pip index f5d09e4a..5cadfafb 100644 --- a/requirements/test.pip +++ b/requirements/test.pip @@ -1,6 +1,6 @@ # Tests mock -pytest +pytest==5.3.5 # Optional Packages Markdown >= 3.1 From 88100484e0aafc17fa4a8fcd01966c9c9ca8d25d Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Sun, 12 Apr 2020 15:16:12 +0200 Subject: [PATCH 4/7] Move more test deps from CI config to requirements --- requirements/test.pip | 1 + tox.ini | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/test.pip b/requirements/test.pip index 5cadfafb..25ab14ea 100644 --- a/requirements/test.pip +++ b/requirements/test.pip @@ -1,6 +1,7 @@ # Tests mock pytest==5.3.5 +pytest-cov # Optional Packages Markdown >= 3.1 diff --git a/tox.ini b/tox.ini index 7ddcfae0..cf8b150a 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,6 @@ passenv = * usedevelop=True deps = -rrequirements/test.pip - pytest - pytest-cov pygments==2.1.3 commands = From b6dc55f96c9e97b637f0b5e4720e61170d5d43fd Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Sun, 12 Apr 2020 15:21:17 +0200 Subject: [PATCH 5/7] Add poetry.lock to list of files for Git to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c1835e10..b94526d6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ htmlcov venv samples/output *.pem +poetry.lock From 18c7a9c3a1cd152d03b76dd08fb876184ab4e5de Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Sun, 12 Apr 2020 15:38:17 +0200 Subject: [PATCH 6/7] Pin pytest in pyproject also --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4d1477c0..cf79a74e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ sphinx = "=1.4.9" sphinx_rtd_theme = "^0.4.3" livereload = "^2.6" mock = "^3.0" -pytest = "^5.2" +pytest = "~5.3.5" pytest-cov = "^2.8" pytest-pythonpath = "^0.7.3" pytest-sugar = "^0.9.2" From 7bbd3dc6fbd31da5ce69a1347c5f72db73a5e6fc Mon Sep 17 00:00:00 2001 From: Kurt McKee Date: Sun, 12 Apr 2020 09:38:35 -0500 Subject: [PATCH 7/7] Update links to HTTPS and current 301 redirects in docs/templates/themes (#2661) This also updates the Tumblr API to use HTTPS as documented in the current Tumblr API docs. --- LICENSE | 6 ++-- README.rst | 4 +-- docs/content.rst | 6 ++-- docs/faq.rst | 4 +-- docs/importer.rst | 10 +++---- docs/index.rst | 2 +- docs/install.rst | 28 +++++++++---------- docs/internals.rst | 2 +- docs/publish.rst | 2 +- docs/quickstart.rst | 4 +-- docs/settings.rst | 6 ++-- docs/themes.rst | 4 +-- .../basic/a-markdown-powered-article.html | 4 +-- pelican/tests/output/basic/archives.html | 4 +-- pelican/tests/output/basic/article-1.html | 4 +-- pelican/tests/output/basic/article-2.html | 4 +-- pelican/tests/output/basic/article-3.html | 4 +-- .../output/basic/author/alexis-metaireau.html | 4 +-- pelican/tests/output/basic/authors.html | 4 +-- pelican/tests/output/basic/categories.html | 4 +-- pelican/tests/output/basic/category/bar.html | 4 +-- pelican/tests/output/basic/category/cat1.html | 4 +-- pelican/tests/output/basic/category/misc.html | 4 +-- pelican/tests/output/basic/category/yeah.html | 4 +-- .../output/basic/drafts/a-draft-article.html | 4 +-- .../basic/filename_metadata-example.html | 4 +-- pelican/tests/output/basic/index.html | 4 +-- pelican/tests/output/basic/oh-yeah.html | 4 +-- .../tests/output/basic/override/index.html | 4 +-- .../pages/this-is-a-test-hidden-page.html | 4 +-- .../basic/pages/this-is-a-test-page.html | 4 +-- .../tests/output/basic/second-article-fr.html | 4 +-- .../tests/output/basic/second-article.html | 4 +-- pelican/tests/output/basic/tag/bar.html | 4 +-- pelican/tests/output/basic/tag/baz.html | 4 +-- pelican/tests/output/basic/tag/foo.html | 4 +-- pelican/tests/output/basic/tag/foobar.html | 4 +-- pelican/tests/output/basic/tag/oh.html | 4 +-- pelican/tests/output/basic/tag/yeah.html | 4 +-- pelican/tests/output/basic/tags.html | 4 +-- pelican/tests/output/basic/theme/css/main.css | 4 +-- .../tests/output/basic/theme/css/reset.css | 2 +- .../output/basic/this-is-a-super-article.html | 4 +-- pelican/tests/output/basic/unbelievable.html | 4 +-- .../custom/a-markdown-powered-article.html | 4 +-- pelican/tests/output/custom/archives.html | 4 +-- pelican/tests/output/custom/article-1.html | 4 +-- pelican/tests/output/custom/article-2.html | 4 +-- pelican/tests/output/custom/article-3.html | 4 +-- .../custom/author/alexis-metaireau.html | 4 +-- .../custom/author/alexis-metaireau2.html | 4 +-- .../custom/author/alexis-metaireau3.html | 4 +-- pelican/tests/output/custom/authors.html | 4 +-- pelican/tests/output/custom/categories.html | 4 +-- pelican/tests/output/custom/category/bar.html | 4 +-- .../tests/output/custom/category/cat1.html | 4 +-- .../tests/output/custom/category/misc.html | 4 +-- .../tests/output/custom/category/yeah.html | 4 +-- .../output/custom/drafts/a-draft-article.html | 4 +-- .../custom/filename_metadata-example.html | 4 +-- pelican/tests/output/custom/index.html | 4 +-- pelican/tests/output/custom/index2.html | 4 +-- pelican/tests/output/custom/index3.html | 4 +-- .../tests/output/custom/jinja2_template.html | 4 +-- pelican/tests/output/custom/oh-yeah-fr.html | 4 +-- pelican/tests/output/custom/oh-yeah.html | 4 +-- .../tests/output/custom/override/index.html | 4 +-- .../pages/this-is-a-test-hidden-page.html | 4 +-- .../custom/pages/this-is-a-test-page.html | 4 +-- .../output/custom/second-article-fr.html | 4 +-- .../tests/output/custom/second-article.html | 4 +-- pelican/tests/output/custom/tag/bar.html | 4 +-- pelican/tests/output/custom/tag/baz.html | 4 +-- pelican/tests/output/custom/tag/foo.html | 4 +-- pelican/tests/output/custom/tag/foobar.html | 4 +-- pelican/tests/output/custom/tag/oh.html | 4 +-- pelican/tests/output/custom/tag/yeah.html | 4 +-- pelican/tests/output/custom/tags.html | 4 +-- .../tests/output/custom/theme/css/main.css | 4 +-- .../tests/output/custom/theme/css/reset.css | 2 +- .../custom/this-is-a-super-article.html | 4 +-- pelican/tests/output/custom/unbelievable.html | 4 +-- .../tests/output/custom_locale/archives.html | 4 +-- .../author/alexis-metaireau.html | 4 +-- .../author/alexis-metaireau2.html | 4 +-- .../author/alexis-metaireau3.html | 4 +-- .../tests/output/custom_locale/authors.html | 4 +-- .../output/custom_locale/categories.html | 4 +-- .../output/custom_locale/category/bar.html | 4 +-- .../output/custom_locale/category/cat1.html | 4 +-- .../output/custom_locale/category/misc.html | 4 +-- .../output/custom_locale/category/yeah.html | 4 +-- .../custom_locale/drafts/a-draft-article.html | 4 +-- pelican/tests/output/custom_locale/index.html | 4 +-- .../tests/output/custom_locale/index2.html | 4 +-- .../tests/output/custom_locale/index3.html | 4 +-- .../output/custom_locale/jinja2_template.html | 4 +-- .../output/custom_locale/oh-yeah-fr.html | 4 +-- .../output/custom_locale/override/index.html | 4 +-- .../pages/this-is-a-test-hidden-page.html | 4 +-- .../pages/this-is-a-test-page.html | 4 +-- .../02/this-is-a-super-article/index.html | 4 +-- .../2010/octobre/15/unbelievable/index.html | 4 +-- .../posts/2010/octobre/20/oh-yeah/index.html | 4 +-- .../20/a-markdown-powered-article/index.html | 4 +-- .../2011/février/17/article-1/index.html | 4 +-- .../2011/février/17/article-2/index.html | 4 +-- .../2011/février/17/article-3/index.html | 4 +-- .../2012/février/29/second-article/index.html | 4 +-- .../30/filename_metadata-example/index.html | 4 +-- .../custom_locale/second-article-fr.html | 4 +-- .../tests/output/custom_locale/tag/bar.html | 4 +-- .../tests/output/custom_locale/tag/baz.html | 4 +-- .../tests/output/custom_locale/tag/foo.html | 4 +-- .../output/custom_locale/tag/foobar.html | 4 +-- .../tests/output/custom_locale/tag/oh.html | 4 +-- .../tests/output/custom_locale/tag/yeah.html | 4 +-- pelican/tests/output/custom_locale/tags.html | 4 +-- .../output/custom_locale/theme/css/main.css | 4 +-- .../output/custom_locale/theme/css/reset.css | 2 +- pelican/tests/test_pelican.py | 3 +- pelican/themes/notmyidea/static/css/main.css | 4 +-- pelican/themes/notmyidea/static/css/reset.css | 2 +- pelican/themes/notmyidea/templates/base.html | 4 +-- pelican/themes/simple/templates/base.html | 4 +-- pelican/tools/pelican_import.py | 4 +-- pelican/tools/pelican_quickstart.py | 2 +- pelican/tools/templates/pelicanconf.py.jinja2 | 6 ++-- 128 files changed, 267 insertions(+), 266 deletions(-) diff --git a/LICENSE b/LICENSE index dba13ed2..c03a4e46 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -. +. diff --git a/README.rst b/README.rst index 176dfce4..6f83188c 100644 --- a/README.rst +++ b/README.rst @@ -50,8 +50,8 @@ Why the name "Pelican"? .. _Python: https://www.python.org/ .. _reStructuredText: http://docutils.sourceforge.net/rst.html .. _Markdown: https://daringfireball.net/projects/markdown/ -.. _Jinja2: http://jinja.pocoo.org/ -.. _Pygments: http://pygments.org/ +.. _Jinja2: https://palletsprojects.com/p/jinja/ +.. _Pygments: https://pygments.org/ .. _`Pelican's documentation`: https://docs.getpelican.com/ .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html .. _`hosted on GitHub`: https://github.com/getpelican/pelican diff --git a/docs/content.rst b/docs/content.rst index c51e5e66..a52425a4 100644 --- a/docs/content.rst +++ b/docs/content.rst @@ -524,7 +524,7 @@ indenting both the identifier and the code:: print("The path-less shebang syntax *will* show line numbers.") The specified identifier (e.g. ``python``, ``ruby``) should be one that -appears on the `list of available lexers `_. +appears on the `list of available lexers `_. When using reStructuredText the following options are available in the code-block directive: @@ -565,7 +565,7 @@ tagurlformat string format for the ctag links. Note that, depending on the version, your Pygments module might not have all of these options available. Refer to the *HtmlFormatter* section of the -`Pygments documentation `_ for more +`Pygments documentation `_ for more details on each of the options. For example, the following code block enables line numbers, starting at 153, @@ -611,7 +611,7 @@ To publish a post when the default status is ``draft``, update the post's metadata to include ``Status: published``. .. _W3C ISO 8601: https://www.w3.org/TR/NOTE-datetime -.. _AsciiDoc: http://www.methods.co.nz/asciidoc/ +.. _AsciiDoc: https://www.methods.co.nz/asciidoc/ .. _pelican-plugins: https://github.com/getpelican/pelican-plugins .. _Markdown Extensions: https://python-markdown.github.io/extensions/ .. _CodeHilite extension: https://python-markdown.github.io/extensions/code_hilite/#syntax diff --git a/docs/faq.rst b/docs/faq.rst index d469f386..bfe51ec0 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -48,7 +48,7 @@ themes to style code syntax highlighting via CSS. Specifically, you can customize the appearance of your syntax highlighting via the ``.highlight pre`` class in your theme's CSS file. To see how various styles can be used to render Django code, for example, use the style selector drop-down at top-right on the -`Pygments project demo site `_. +`Pygments project demo site `_. You can use the following example commands to generate a starting CSS file from a Pygments built-in style (in this case, "monokai") and then copy the generated @@ -167,7 +167,7 @@ I'm getting a warning about feeds generated without SITEURL being set properly ============================================================================== `RSS and Atom feeds require all URL links to be absolute -`_. In order to properly +`_. In order to properly generate links in Pelican you will need to set ``SITEURL`` to the full path of your site. diff --git a/docs/importer.rst b/docs/importer.rst index 674dd9b1..88588d17 100644 --- a/docs/importer.rst +++ b/docs/importer.rst @@ -39,8 +39,8 @@ Dependencies - *Pandoc*, see the `Pandoc site`_ for installation instructions on your operating system. -.. _Pandoc: http://johnmacfarlane.net/pandoc/ -.. _Pandoc site: http://johnmacfarlane.net/pandoc/installing.html +.. _Pandoc: https://pandoc.org/ +.. _Pandoc site: https://pandoc.org/installing.html Usage @@ -58,7 +58,7 @@ Positional arguments ============= ============================================================================ ``input`` The input file to read ``api_token`` (Posterous only) api_token can be obtained from http://posterous.com/api/ - ``api_key`` (Tumblr only) api_key can be obtained from http://www.tumblr.com/oauth/apps + ``api_key`` (Tumblr only) api_key can be obtained from https://www.tumblr.com/oauth/apps ============= ============================================================================ Optional arguments @@ -137,7 +137,7 @@ Tests To test the module, one can use sample files: -- for WordPress: http://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/ +- for WordPress: https://www.wpbeginner.com/wp-themes/how-to-add-dummy-content-for-theme-development-in-wordpress/ - for Dotclear: http://media.dotaddict.org/tda/downloads/lorem-backup.txt -.. _more_categories: http://github.com/getpelican/pelican-plugins/tree/master/more_categories \ No newline at end of file +.. _more_categories: https://github.com/getpelican/pelican-plugins/tree/master/more_categories \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index 678732d8..4cbe41ae 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -79,7 +79,7 @@ Documentation .. _Python: https://www.python.org/ .. _reStructuredText: http://docutils.sourceforge.net/rst.html .. _Markdown: https://daringfireball.net/projects/markdown/ -.. _Jinja2: http://jinja.pocoo.org/ +.. _Jinja2: https://palletsprojects.com/p/jinja/ .. _`Pelican documentation`: https://docs.getpelican.com/latest/ .. _`Pelican's internals`: https://docs.getpelican.com/en/latest/internals.html .. _`Pelican plugins`: https://github.com/getpelican/pelican-plugins diff --git a/docs/install.rst b/docs/install.rst index d683ed8f..03480e79 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -5,7 +5,7 @@ Pelican currently runs best on Python 2.7.x and 3.5+; earlier versions of Python are not supported. You can install Pelican via several different methods. The simplest is via -`pip `_:: +`pip `_:: pip install pelican @@ -43,7 +43,7 @@ options. For more detail, refer to the :doc:`Publish` section. Optional packages ----------------- -If you plan on using `Markdown `_ as a +If you plan on using `Markdown `_ as a markup format, you can install Pelican with Markdown support:: pip install pelican[Markdown] @@ -53,7 +53,7 @@ Or you might need to install it a posteriori:: pip install Markdown Typographical enhancements can be enabled in your settings file, but first the -requisite `Typogrify `_ library must be +requisite `Typogrify `_ library must be installed:: pip install typogrify @@ -64,22 +64,22 @@ Dependencies When Pelican is installed, the following dependent Python packages should be automatically installed without any action on your part: -* `feedgenerator `_, to generate the +* `feedgenerator `_, to generate the Atom feeds -* `jinja2 `_, for templating support -* `pygments `_, for syntax highlighting -* `docutils `_, for supporting +* `jinja2 `_, for templating support +* `pygments `_, for syntax highlighting +* `docutils `_, for supporting reStructuredText as an input format -* `pytz `_, for timezone definitions -* `blinker `_, an object-to-object and +* `pytz `_, for timezone definitions +* `blinker `_, an object-to-object and broadcast signaling system -* `unidecode `_, for ASCII +* `unidecode `_, for ASCII transliterations of Unicode text -* `six `_, for Python 2 and 3 compatibility +* `six `_, for Python 2 and 3 compatibility utilities -* `MarkupSafe `_, for a markup safe +* `MarkupSafe `_, for a markup safe string implementation -* `python-dateutil `_, to read +* `python-dateutil `_, to read the date metadata Upgrading @@ -126,4 +126,4 @@ content):: The next step is to begin to adding content to the *content* folder that has been created for you. -.. _virtualenv: http://www.virtualenv.org/ +.. _virtualenv: https://virtualenv.pypa.io/en/latest/ diff --git a/docs/internals.rst b/docs/internals.rst index e8d35148..5b41070e 100644 --- a/docs/internals.rst +++ b/docs/internals.rst @@ -32,7 +32,7 @@ The logic is separated into different classes and concepts: inputs. * Pelican also uses templates, so it's easy to write your own theme. The - syntax is `Jinja2 `_ and is very easy to learn, so + syntax is `Jinja2 `_ and is very easy to learn, so don't hesitate to jump in and build your own theme. How to implement a new reader? diff --git a/docs/publish.rst b/docs/publish.rst index 489558d8..9bea8938 100644 --- a/docs/publish.rst +++ b/docs/publish.rst @@ -207,4 +207,4 @@ That's it! Your site should now be live. executables, such as ``python3``, you can set the ``PY`` and ``PELICAN`` environment variables, respectively, to override the default executable names.) -.. _Invoke: http://www.pyinvoke.org +.. _Invoke: https://www.pyinvoke.org/ diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 484a318f..1f6358a7 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -30,7 +30,7 @@ by asking some questions about your site:: For questions that have default values denoted in brackets, feel free to use the Return key to accept those default values [#tzlocal_fn]_. When asked for your URL prefix, enter your domain name as indicated (e.g., -``http://example.com``). +``https://example.com``). Create an article ----------------- @@ -78,5 +78,5 @@ Footnotes --------- .. [#tzlocal_fn] You can help localize default fields by installing the - optional `tzlocal `_ + optional `tzlocal `_ module. diff --git a/docs/settings.rst b/docs/settings.rst index 51caad28..9ebf85c2 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -709,7 +709,7 @@ Time and Date .. [#] Default is the system locale. -.. _locales on Windows: http://msdn.microsoft.com/en-us/library/cdax410z%28VS.71%29.aspx +.. _locales on Windows: https://www.microsoft.com/en-us/download/details.aspx?id=55979 .. _locale(1): https://linux.die.net/man/1/locale @@ -1357,6 +1357,6 @@ Example settings :language: python -.. _Jinja custom filters documentation: http://jinja.pocoo.org/docs/api/#custom-filters -.. _Jinja Environment documentation: http://jinja.pocoo.org/docs/dev/api/#jinja2.Environment +.. _Jinja custom filters documentation: https://jinja.palletsprojects.com/en/master/api/#custom-filters +.. _Jinja Environment documentation: https://jinja.palletsprojects.com/en/master/api/#jinja2.Environment .. _Docutils Configuration: http://docutils.sourceforge.net/docs/user/config.html diff --git a/docs/themes.rst b/docs/themes.rst index ea9214fe..a2332615 100644 --- a/docs/themes.rst +++ b/docs/themes.rst @@ -4,7 +4,7 @@ Creating themes ############### To generate its HTML output, Pelican uses the `Jinja -`_ templating engine due to its flexibility and +`_ templating engine due to its flexibility and straightforward syntax. If you want to create your own theme, feel free to take inspiration from the `"simple" theme `_. @@ -104,7 +104,7 @@ that allow them to be easily sorted by name:: If you want to sort based on different criteria, `Jinja's sort command`__ has a number of options. -__ http://jinja.pocoo.org/docs/templates/#sort +__ https://jinja.palletsprojects.com/en/master/templates/#sort Date Formatting diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html index 9053d5fe..e08cabd8 100644 --- a/pelican/tests/output/basic/a-markdown-powered-article.html +++ b/pelican/tests/output/basic/a-markdown-powered-article.html @@ -55,10 +55,10 @@ diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html index dcebef2c..79ad0452 100644 --- a/pelican/tests/output/basic/archives.html +++ b/pelican/tests/output/basic/archives.html @@ -58,10 +58,10 @@ diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html index 758ddf06..71449b0b 100644 --- a/pelican/tests/output/basic/article-1.html +++ b/pelican/tests/output/basic/article-1.html @@ -54,10 +54,10 @@ diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html index 40d2cefd..159eda1d 100644 --- a/pelican/tests/output/basic/article-2.html +++ b/pelican/tests/output/basic/article-2.html @@ -54,10 +54,10 @@ diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html index 1ef6b651..4c92c35b 100644 --- a/pelican/tests/output/basic/article-3.html +++ b/pelican/tests/output/basic/article-3.html @@ -54,10 +54,10 @@ diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html index aa19e421..0a1c5e56 100644 --- a/pelican/tests/output/basic/author/alexis-metaireau.html +++ b/pelican/tests/output/basic/author/alexis-metaireau.html @@ -98,10 +98,10 @@ YEAH !

diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html index c2b695c0..1aad3027 100644 --- a/pelican/tests/output/basic/authors.html +++ b/pelican/tests/output/basic/authors.html @@ -40,10 +40,10 @@ diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html index 934c224b..ecaf5669 100644 --- a/pelican/tests/output/basic/categories.html +++ b/pelican/tests/output/basic/categories.html @@ -39,10 +39,10 @@ diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html index 2d327f5f..a4cafcaf 100644 --- a/pelican/tests/output/basic/category/bar.html +++ b/pelican/tests/output/basic/category/bar.html @@ -54,10 +54,10 @@ YEAH !

diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html index 9d8a8883..bc45f1fe 100644 --- a/pelican/tests/output/basic/category/cat1.html +++ b/pelican/tests/output/basic/category/cat1.html @@ -113,10 +113,10 @@ diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html index 0542dba1..aaa35f6d 100644 --- a/pelican/tests/output/basic/category/misc.html +++ b/pelican/tests/output/basic/category/misc.html @@ -124,10 +124,10 @@ pelican.conf, it will …

diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html index 2621e587..d0fd9130 100644 --- a/pelican/tests/output/basic/category/yeah.html +++ b/pelican/tests/output/basic/category/yeah.html @@ -64,10 +64,10 @@ diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html index 7fe1b180..081c2e75 100644 --- a/pelican/tests/output/basic/drafts/a-draft-article.html +++ b/pelican/tests/output/basic/drafts/a-draft-article.html @@ -55,10 +55,10 @@ listed anywhere else.

diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html index 98930240..7203e648 100644 --- a/pelican/tests/output/basic/filename_metadata-example.html +++ b/pelican/tests/output/basic/filename_metadata-example.html @@ -54,10 +54,10 @@ diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html index 5b037545..092a4d30 100644 --- a/pelican/tests/output/basic/index.html +++ b/pelican/tests/output/basic/index.html @@ -261,10 +261,10 @@ pelican.conf, it will …

diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html index df378418..dba8b114 100644 --- a/pelican/tests/output/basic/oh-yeah.html +++ b/pelican/tests/output/basic/oh-yeah.html @@ -62,10 +62,10 @@ YEAH !

diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html index 3b45f9e0..8084f9b4 100644 --- a/pelican/tests/output/basic/override/index.html +++ b/pelican/tests/output/basic/override/index.html @@ -39,10 +39,10 @@ at a custom location.

diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html index 6e1bd4eb..898550bc 100644 --- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html +++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html @@ -39,10 +39,10 @@ Anyone can see this page but it's not linked to anywhere!

diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html index ed9bce91..710f22b4 100644 --- a/pelican/tests/output/basic/pages/this-is-a-test-page.html +++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html @@ -39,10 +39,10 @@ diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html index 1e5f1ef9..689c3373 100644 --- a/pelican/tests/output/basic/second-article-fr.html +++ b/pelican/tests/output/basic/second-article-fr.html @@ -58,10 +58,10 @@ diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html index 4485e9f8..784fdc9b 100644 --- a/pelican/tests/output/basic/second-article.html +++ b/pelican/tests/output/basic/second-article.html @@ -58,10 +58,10 @@ diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html index 7e977f0e..0227a65e 100644 --- a/pelican/tests/output/basic/tag/bar.html +++ b/pelican/tests/output/basic/tag/bar.html @@ -110,10 +110,10 @@ YEAH !

diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html index 48a11061..761d5b3d 100644 --- a/pelican/tests/output/basic/tag/baz.html +++ b/pelican/tests/output/basic/tag/baz.html @@ -54,10 +54,10 @@ diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html index aad78781..7f1d586b 100644 --- a/pelican/tests/output/basic/tag/foo.html +++ b/pelican/tests/output/basic/tag/foo.html @@ -82,10 +82,10 @@ as well as inline markup.

diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html index cc72782c..e558f4c2 100644 --- a/pelican/tests/output/basic/tag/foobar.html +++ b/pelican/tests/output/basic/tag/foobar.html @@ -64,10 +64,10 @@ diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html index 0993e43e..d1f44c07 100644 --- a/pelican/tests/output/basic/tag/oh.html +++ b/pelican/tests/output/basic/tag/oh.html @@ -38,10 +38,10 @@ diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html index 49d1616d..6130eff8 100644 --- a/pelican/tests/output/basic/tag/yeah.html +++ b/pelican/tests/output/basic/tag/yeah.html @@ -54,10 +54,10 @@ YEAH !

diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html index afcd2bab..3d8d45c3 100644 --- a/pelican/tests/output/basic/tags.html +++ b/pelican/tests/output/basic/tags.html @@ -45,10 +45,10 @@ diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css index 5feb71ce..63f5adc0 100644 --- a/pelican/tests/output/basic/theme/css/main.css +++ b/pelican/tests/output/basic/theme/css/main.css @@ -3,8 +3,8 @@ Date: July 2009 Description: Sample layout for HTML5 and CSS3 goodness. Version: 1.0 - License: MIT - Licensed by: Smashing Media GmbH + License: MIT + Licensed by: Smashing Media GmbH Original author: Enrique Ramírez */ diff --git a/pelican/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css index 1e217566..c88e6196 100644 --- a/pelican/tests/output/basic/theme/css/reset.css +++ b/pelican/tests/output/basic/theme/css/reset.css @@ -2,7 +2,7 @@ Name: Reset Stylesheet Description: Resets browser's default CSS Author: Eric Meyer - Author URI: http://meyerweb.com/eric/tools/css/reset/ + Author URI: https://meyerweb.com/eric/tools/css/reset/ */ /* v1.0 | 20080212 */ diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html index 5e6f1365..aed2ab39 100644 --- a/pelican/tests/output/basic/this-is-a-super-article.html +++ b/pelican/tests/output/basic/this-is-a-super-article.html @@ -72,10 +72,10 @@ diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html index 857b1dc1..518781eb 100644 --- a/pelican/tests/output/basic/unbelievable.html +++ b/pelican/tests/output/basic/unbelievable.html @@ -86,10 +86,10 @@ pelican.conf, it will have nothing in default.

diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html index 5c416f2f..e5fda57c 100644 --- a/pelican/tests/output/custom/a-markdown-powered-article.html +++ b/pelican/tests/output/custom/a-markdown-powered-article.html @@ -92,10 +92,10 @@