Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/jinja/files: jinja-2.7-docs.patch
Date: Thu, 23 May 2013 01:44:55
Message-Id: 20130523014448.D89162171D@flycatcher.gentoo.org
1 floppym 13/05/23 01:44:48
2
3 Added: jinja-2.7-docs.patch
4 Log:
5 Fix error building docs, bug 470856.
6
7 (Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
8
9 Revision Changes Path
10 1.1 dev-python/jinja/files/jinja-2.7-docs.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/files/jinja-2.7-docs.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/jinja/files/jinja-2.7-docs.patch?rev=1.1&content-type=text/plain
14
15 Index: jinja-2.7-docs.patch
16 ===================================================================
17 From da94a8b504d981cb5f877219811d169823a2095e Mon Sep 17 00:00:00 2001
18 From: Armin Ronacher <armin.ronacher@××××××××.com>
19 Date: Mon, 20 May 2013 14:06:59 +0100
20 Subject: [PATCH] Fixed docs not building
21
22 ---
23 docs/faq.rst | 2 +-
24 docs/jinjaext.py | 2 +-
25 docs/templates.rst | 2 +-
26 3 files changed, 3 insertions(+), 3 deletions(-)
27
28 diff --git a/docs/faq.rst b/docs/faq.rst
29 index 4db5079..00a4d0d 100644
30 --- a/docs/faq.rst
31 +++ b/docs/faq.rst
32 @@ -157,7 +157,7 @@ Python 2.3 support you either have to use `Jinja 1`_ or other templating
33 engines that still support 2.3.
34
35 My Macros are overridden by something
36 -------------------------------------
37 +-------------------------------------
38
39 In some situations the Jinja scoping appears arbitrary:
40
41 diff --git a/docs/jinjaext.py b/docs/jinjaext.py
42 index 8395a55..3c217f8 100644
43 --- a/docs/jinjaext.py
44 +++ b/docs/jinjaext.py
45 @@ -23,7 +23,7 @@
46 from pygments.token import Keyword, Name, Comment, String, Error, \
47 Number, Operator, Generic
48 from jinja2 import Environment, FileSystemLoader
49 -from jinja2.utils import next
50 +from jinja2._compat import next
51
52
53 def parse_rst(state, content_offset, doc):
54 diff --git a/docs/templates.rst b/docs/templates.rst
55 index e0a19fa..4a6a379 100644
56 --- a/docs/templates.rst
57 +++ b/docs/templates.rst
58 @@ -579,7 +579,7 @@ Inside of a for-loop block you can access some special variables:
59 | `loop.depth` | Indicates how deep in deep in a recursive loop |
60 | | the rendering currently is. Starts at level 1 |
61 +-----------------------+---------------------------------------------------+
62 -| `loop.depth0 | Indicates how deep in deep in a recursive loop |
63 +| `loop.depth0` | Indicates how deep in deep in a recursive loop |
64 | | the rendering currently is. Starts at level 0 |
65 +-----------------------+---------------------------------------------------+
66
67 --
68 1.8.1.6