Skip to content

Commit

Permalink
make the loader compatible with django 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
kakulukia committed Mar 23, 2018
1 parent 30f5d16 commit d996f50
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ lint: ## check style with flake8
test: ## run testsuite
@SCRIPT_DIR=$$( cd "$$( dirname "$$0" )" && pwd ); \
export PYTHONPATH=$$PYTHONPATH:$$SCRIPT_DIR; \
nosetests -w pypugjs/testsuite/ # --nocapture for debugging
nosetests -w pypugjs/testsuite/ # --nocapture # for debugging
@make lint

coverage: ## test and generate coverage data
Expand Down
6 changes: 0 additions & 6 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
[[source]]

url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"


[packages]

"jinja2" = "*"
mako = "*"
tornado = "*"
six = "*"
coverage = "*"
nose = "*"
flask = "*"
django = "*"


[dev-packages]

ipdb = "*"
3 changes: 1 addition & 2 deletions pypugjs/ext/django/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def get_template_sources(self, template_name):
for origin in loader.get_template_sources(template_name):
yield origin

def get_template(self, template_name, skip=None):
def get_template(self, template_name, skip=None, **kwargs):
"""
Call self.get_template_sources() and return a Template object for
the first template matching template_name. If skip is provided, ignore
Expand All @@ -74,7 +74,6 @@ def get_template(self, template_name, skip=None):
also cached because this resulted in a major loading issued in a
wagtail admin instance.
"""

template = self.template_cache.get(template_name)
if not template or self.debug:
try:
Expand Down

0 comments on commit d996f50

Please sign in to comment.