From: David Lord Date: Fri, 26 Jul 2019 19:12:41 +0000 (-0700) Subject: fix linkcheck issues X-Git-Tag: 2.9.x~1^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06696563d78e4f925426746d3b05b744804a66f4;p=thirdparty%2Fjinja.git fix linkcheck issues --- diff --git a/CHANGES.rst b/CHANGES.rst index 241136b3..4d5ba6de 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -205,10 +205,10 @@ Version 2.7.2 - Prefix loader was not forwarding the locals properly to inner loaders. This is now fixed. - Security issue: Changed the default folder for the filesystem cache to be - user specific and read and write protected on UNIX systems. See `Debian bug - 734747`_ for more information. + user specific and read and write protected on UNIX systems. See + `Debian bug 734747`_ for more information. -.. _Debian bug 734747: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734747 +.. _Debian bug 734747: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734747 Version 2.7.1 ------------- diff --git a/docs/api.rst b/docs/api.rst index fdd508d3..a11ddde7 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -114,7 +114,7 @@ for everything else `unicode`: u'f\xf6\xf6' -.. _Unicode documentation: http://docs.python.org/dev/howto/unicode.html +.. _Unicode documentation: https://docs.python.org/3/howto/unicode.html High Level API -------------- diff --git a/docs/extensions.rst b/docs/extensions.rst index 43ee2e27..a07b557d 100644 --- a/docs/extensions.rst +++ b/docs/extensions.rst @@ -106,7 +106,7 @@ current configuration. (For example by using `gettext.find`) The usage of the `i18n` extension for template designers is covered as part :ref:`of the template documentation `. -.. _gettext: http://docs.python.org/dev/library/gettext +.. _gettext: https://docs.python.org/3/library/gettext.html .. _Babel: http://babel.pocoo.org/ .. _newstyle-gettext: @@ -223,7 +223,7 @@ Example Extension ~~~~~~~~~~~~~~~~~ The following example implements a `cache` tag for Jinja2 by using the -`Werkzeug`_ caching contrib module: +`cachelib`_ library: .. literalinclude:: cache_extension.py :language: python @@ -231,7 +231,7 @@ The following example implements a `cache` tag for Jinja2 by using the And here is how you use it in an environment:: from jinja2 import Environment - from werkzeug.contrib.cache import SimpleCache + from cachelib import SimpleCache env = Environment(extensions=[FragmentCacheExtension]) env.fragment_cache = SimpleCache() @@ -247,7 +247,7 @@ following example caches a sidebar for 300 seconds: {% endcache %} -.. _Werkzeug: http://werkzeug.pocoo.org/ +.. _cachelib: https://github.com/pallets/cachelib Extension API ~~~~~~~~~~~~~ diff --git a/docs/faq.rst b/docs/faq.rst index 9dd348f5..ef521992 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -26,7 +26,7 @@ speaking the performance of a template engine doesn't matter much as the usual bottleneck in a web application is either the database or the application code. -.. _Mako: http://www.makotemplates.org/ +.. _Mako: https://www.makotemplates.org/ How Compatible is Jinja2 with Django? ------------------------------------- @@ -145,7 +145,7 @@ work in production environments:: sandbox._WHITE_LIST_C_MODULES += ['_ctypes', 'gestalt'] Credit for this snippet goes to `Thomas Johansson -`_ +`_ Why is there no Python 2.3/2.4/2.5/3.1/3.2 support? --------------------------------------------------- @@ -188,4 +188,4 @@ templates passing information to the parent template. To avoid this issue rename the macro or variable in the parent template to have an uncommon prefix. -.. _Jinja 1: http://jinja.pocoo.org/1/ +.. _Jinja 1: https://pypi.org/project/Jinja/ diff --git a/docs/integration.rst b/docs/integration.rst index 3a4988b0..e84e5793 100644 --- a/docs/integration.rst +++ b/docs/integration.rst @@ -76,7 +76,7 @@ snippet and add it into your `config/environment.py`:: config['pylons.strict_c'] = True -.. _Pylons: http://www.pylonshq.com/ +.. _Pylons: https://pylonshq.com/ TextMate -------- @@ -91,11 +91,11 @@ Vim A syntax plugin for `Vim`_ exists in the Vim-scripts directory as well as the `ext` folder at the root of the Jinja2 project. `The script -`_ supports Jinja1 and +`_ supports Jinja1 and Jinja2. Once installed two file types are available `jinja` and `htmljinja`. The first one for text based templates, the latter for HTML templates. Copy the files into your `syntax` folder. .. _Babel: http://babel.pocoo.org/ -.. _Vim: http://www.vim.org/ +.. _Vim: https://www.vim.org/ diff --git a/docs/intro.rst b/docs/intro.rst index e097718e..90636f57 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -60,12 +60,12 @@ As an alternative to steps 4 you can also do ``python setup.py develop`` which will install the package via `distribute` in development mode. This also has the advantage that the C extensions are compiled. -.. _download page: http://pypi.python.org/pypi/Jinja2 -.. _distribute: http://pypi.python.org/pypi/distribute -.. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools -.. _easy_install: http://peak.telecommunity.com/DevCenter/EasyInstall -.. _pip: http://pypi.python.org/pypi/pip -.. _git: http://git-scm.org/ +.. _download page: https://pypi.org/project/Jinja2/ +.. _distribute: https://pypi.org/project/distribute/ +.. _setuptools: https://pypi.org/project/setuptools/ +.. _easy_install: https://setuptools.readthedocs.io/en/latest/easy_install.html +.. _pip: https://pypi.org/project/pip/ +.. _git: https://git-scm.com/ MarkupSafe Dependency @@ -75,7 +75,7 @@ As of version 2.7 Jinja2 depends on the `MarkupSafe`_ module. If you install Jinja2 via `pip` or `easy_install` it will be installed automatically for you. -.. _MarkupSafe: http://pypi.python.org/pypi/MarkupSafe +.. _MarkupSafe: https://markupsafe.palletsprojects.com/ Basic API Usage --------------- @@ -117,4 +117,4 @@ in mind, so you will have to adapt the shown code examples to Python 3 syntax for yourself. -.. _Jinja bug tracker: http://github.com/pallets/jinja/issues +.. _Jinja bug tracker: https://github.com/pallets/jinja/issues diff --git a/jinja2/bccache.py b/jinja2/bccache.py index d687d036..507a9b3d 100644 --- a/jinja2/bccache.py +++ b/jinja2/bccache.py @@ -296,9 +296,8 @@ class MemcachedBytecodeCache(BytecodeCache): Libraries compatible with this class: - - `werkzeug `_.contrib.cache - - `python-memcached `_ - - `cmemcache `_ + - `cachelib `_ + - `python-memcached `_ (Unfortunately the django cache interface is not compatible because it does not support storing binary data, only unicode. You can however pass