From 48b7751f80dc78af1799762a39f742bab8feb90a Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ilya@archive.org>
Date: Mon, 19 Jan 2015 21:54:11 -0500
Subject: [PATCH] bump version to 0.7.6 jinja2: allow adding multiple packages
 to search path

---
 CHANGES.rst          | 5 +++++
 README.rst           | 2 +-
 pywb/webapp/views.py | 9 ++++++---
 setup.py             | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d5a9d93d..0d509409 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+pywb 0.7.6 changelist
+~~~~~~~~~~~~~~~~~~~~~
+
+* packaging: allow adding multiple packages for Jinja2 template resolving
+
 pywb 0.7.5 changelist
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/README.rst b/README.rst
index 17162d5a..a445f11f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-PyWb 0.7.5
+PyWb 0.7.6
 ==========
 
 .. image:: https://travis-ci.org/ikreymer/pywb.png?branch=develop
diff --git a/pywb/webapp/views.py b/pywb/webapp/views.py
index 23c528e2..9f2dd1e7 100644
--- a/pywb/webapp/views.py
+++ b/pywb/webapp/views.py
@@ -61,7 +61,7 @@ def is_wb_handler(obj):
 #=================================================================
 class J2TemplateView(object):
     env_globals = {'static_path': 'static/default',
-                   'package': 'pywb'}
+                   'packages': ['pywb']}
 
     def __init__(self, filename):
         template_dir, template_file = path.split(filename)
@@ -84,8 +84,11 @@ class J2TemplateView(object):
         # add relative and absolute path loaders for banner support
         loaders.append(FileSystemLoader('.'))
         loaders.append(FileSystemLoader('/'))
-        loaders.append(PackageLoader(self.env_globals['package'],
-                                     template_dir))
+
+        # add loaders for all specified packages
+        for package in self.env_globals['packages']:
+            loaders.append(PackageLoader(package,
+                                         template_dir))
         return loaders
 
     def render_to_string(self, **kwargs):
diff --git a/setup.py b/setup.py
index e53c340e..2efb448b 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ class PyTest(TestCommand):
 
 setup(
     name='pywb',
-    version='0.7.5',
+    version='0.7.6',
     url='https://github.com/ikreymer/pywb',
     author='Ilya Kreymer',
     author_email='ikreymer@gmail.com',