[arch-commits] Commit in python-jinja/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, June 30, 2013 @ 06:25:57
  Author: foutrelis
Revision: 93253

upgpkg: python-jinja 2.7-2

Fix "PrefixLoader does not pass globals to load" (FS#35480).

Added:
  python-jinja/trunk/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
Modified:
  python-jinja/trunk/PKGBUILD

------------------------------------------------------+
 Fix-PrefixLoader-does-not-pass-globals-to-load.patch |   26 +++++++++++++++++
 PKGBUILD                                             |   15 +++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

Added: Fix-PrefixLoader-does-not-pass-globals-to-load.patch
===================================================================
--- Fix-PrefixLoader-does-not-pass-globals-to-load.patch	                        (rev 0)
+++ Fix-PrefixLoader-does-not-pass-globals-to-load.patch	2013-06-30 04:25:57 UTC (rev 93253)
@@ -0,0 +1,26 @@
+From 478983594423dcdb85e26ea7a02b8d1d72215db6 Mon Sep 17 00:00:00 2001
+From: Morris Jobke <morris.jobke at gmail.com>
+Date: Mon, 27 May 2013 00:54:52 +0300
+Subject: [PATCH] Fix "PrefixLoader does not pass globals to load"
+
+Fix mitsuhiko/jinja2#225
+---
+ jinja2/loaders.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jinja2/loaders.py b/jinja2/loaders.py
+index a9a2625..cc9c683 100644
+--- a/jinja2/loaders.py
++++ b/jinja2/loaders.py
+@@ -349,7 +349,7 @@ def get_source(self, environment, template):
+     def load(self, environment, name, globals=None):
+         loader, local_name = self.get_loader(name)
+         try:
+-            return loader.load(environment, local_name)
++            return loader.load(environment, local_name, globals)
+         except TemplateNotFound:
+             # re-raise the exception with the correct fileame here.
+             # (the one that includes the prefix)
+-- 
+1.8.1.6
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-30 04:25:48 UTC (rev 93252)
+++ PKGBUILD	2013-06-30 04:25:57 UTC (rev 93253)
@@ -4,16 +4,25 @@
 
 pkgname=('python-jinja' 'python2-jinja')
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple pythonic template language written in Python"
 arch=('any')
 url="http://jinja.pocoo.org/"
 license=('BSD')
 makedepends=('python-distribute' 'python2-distribute' 'python-markupsafe'
              'python2-markupsafe')
-source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz)
-sha256sums=('474f1518d189ae7e318b139fecc1d30b943f124448cfa0f09582ca23e069fa4d')
+source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz
+        Fix-PrefixLoader-does-not-pass-globals-to-load.patch)
+sha256sums=('474f1518d189ae7e318b139fecc1d30b943f124448cfa0f09582ca23e069fa4d'
+            '939f61f022a61661bb65e36eb53dd3482cbdb08ea8098c439f7c1aa7f2810b8f')
 
+prepare() {
+  cd "$srcdir/Jinja2-$pkgver"
+
+  # https://github.com/mitsuhiko/jinja2/issues/225
+  patch -Np1 -i "$srcdir/Fix-PrefixLoader-does-not-pass-globals-to-load.patch"
+}
+
 build() {
   cd "$srcdir"