Skip to content

Compatible with Django 1.11 and 1.10 #14

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

Open
alanjds wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Compatible with Django 1.11 and 1.10 #14

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af0b367
Move version check outside of render func
Jan 28, 2015
e90bcfa
Simpler version comparison
alanjds Apr 13, 2017
d44d060
Compat with Django >= 1.10
alanjds Apr 13, 2017
e5ea38e
Apply .as_view() automatically on decorated if possible
alanjds May 23, 2017
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
13 changes: 9 additions & 4 deletions django_quicky/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

__all__ = ["view", "routing"]

DJANGO_GTE_17 = django.VERSION >= (1, 7)
DJANGO_GTE_110 = django.VERSION >= (1, 10)


def render_if(self, render_to=None, condition=lambda: False):
"""
Expand Down Expand Up @@ -123,7 +126,7 @@ def wrapper(request, *args, **kwargs):
if rendering and not isinstance(response, HttpResponse):

if rendering == 'json':
if django.VERSION[0] >= 1 and django.VERSION[1] >= 7:
if DJANGO_GTE_17:
return HttpResponse(json.dumps(response),
content_type="application/json",
*decorator_args, **decorator_kwargs)
Expand Down Expand Up @@ -169,13 +172,15 @@ def other_view(request, pk):
urlpatterns = UrlList()

def url(regex, kwargs=None, name=None, prefix=''):
if prefix and DJANGO_GTE_110:
raise RuntimeError("Support for 'prefix' option on url() was dropped in Django 1.10. Please update your code")

def decorator(func):

kwargs = {'prefix': prefix} if prefix else {}
final_func = func.as_view() if hasattr(func, 'as_view') else func
urlpatterns.append(
addurl(regex, func, kwargs, name or func.__name__, prefix),
addurl(regex, final_func, kwargs, name or func.__name__, **kwargs),
)

return func

return decorator
Expand Down