backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

bump version to 0.7.6

Browse Source 
jinja2: allow adding multiple packages to search path
This commit is contained in:
Ilya Kreymer 2015-01-19 21:54:11 -05:00
parent 71d9e58d7c
commit 48b7751f80
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.rst
View File

@ -1,3 +1,8 @@
pywb 0.7.6 changelist
~~~~~~~~~~~~~~~~~~~~~
* packaging: allow adding multiple packages for Jinja2 template resolving
pywb 0.7.5 changelist pywb 0.7.5 changelist
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~

2
README.rst
View File

@ -1,4 +1,4 @@
PyWb 0.7.5 PyWb 0.7.6
========== ==========
.. image:: https://travis-ci.org/ikreymer/pywb.png?branch=develop .. image:: https://travis-ci.org/ikreymer/pywb.png?branch=develop

9
pywb/webapp/views.py
View File

@ -61,7 +61,7 @@ def is_wb_handler(obj):
#================================================================= #=================================================================
class J2TemplateView(object): class J2TemplateView(object):
env_globals = {'static_path': 'static/default', env_globals = {'static_path': 'static/default',
'package': 'pywb'} 'packages': ['pywb']}
def __init__(self, filename): def __init__(self, filename):
template_dir, template_file = path.split(filename) template_dir, template_file = path.split(filename)
@ -84,8 +84,11 @@ class J2TemplateView(object):
# add relative and absolute path loaders for banner support # add relative and absolute path loaders for banner support
loaders.append(FileSystemLoader('.')) loaders.append(FileSystemLoader('.'))
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 return loaders
def render_to_string(self, **kwargs): def render_to_string(self, **kwargs):

2
setup.py
View File

@ -34,7 +34,7 @@ class PyTest(TestCommand):
setup( setup(
name='pywb', name='pywb',
version='0.7.5', version='0.7.6',
url='https://github.com/ikreymer/pywb', url='https://github.com/ikreymer/pywb',
author='Ilya Kreymer', author='Ilya Kreymer',
author_email='ikreymer@gmail.com', author_email='ikreymer@gmail.com',