Skip to content

Support 1.8-alpha. #2446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 8 commits into from
Jan 23, 2015
Merged

Support 1.8-alpha. #2446

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
25a703b
Work around meta API differences
lovelydinosaur Jan 23, 2015
5eb6949
Drop django-filter from 1.8
lovelydinosaur Jan 23, 2015
e307fd2
Fix test matrix
lovelydinosaur Jan 23, 2015
e988d57
Fix template loader monkey patching to also support 1.8
lovelydinosaur Jan 23, 2015
4cb164b
Add missing skipUnless(django_filters)
lovelydinosaur Jan 23, 2015
f1ac9d3
More graceful handling of malformed Content-Disposition
lovelydinosaur Jan 23, 2015
f3b6eed
More sensible response caching.
lovelydinosaur Jan 23, 2015
04a5f7b
Move 1.8-alpha out of 'expected failures'
lovelydinosaur Jan 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix template loader monkey patching to also support 1.8
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Jan 23, 2015
commit e988d578535fcc820d30dc7c59f1e24f5c911d3c
6 changes: 6 additions & 0 deletions tests/test_htmlrenderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ def get_template(template_name, dirs=None):
return Template("example: {{ object }}")
raise TemplateDoesNotExist(template_name)

def select_template(template_name_list, dirs=None, using=None):
if template_name_list == ['example.html']:
return Template("example: {{ object }}")
raise TemplateDoesNotExist(template_name_list[0])

django.template.loader.get_template = get_template
django.template.loader.select_template = select_template

def tearDown(self):
"""
Expand Down