From 08031dab213095464db1a1fbd6560b1a7b91f640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Bryon?= Date: Mon, 14 Mar 2016 15:40:13 +0100 Subject: [PATCH] Improved support of Python-3.5 and Django-1.9. Refs #112, refs #113. --- .travis.yml | 5 ++++- demo/demoproject/http/views.py | 3 ++- demo/demoproject/wsgi.py | 4 +++- django_downloadview/nginx/response.py | 5 ++--- django_downloadview/test.py | 4 ++-- docs/about/alternatives.txt | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b207d50..e623329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,17 @@ env: - TOXENV=py27-django16 - TOXENV=py27-django17 - TOXENV=py27-django18 + - TOXENV=py27-django19 - TOXENV=py33-django15 - TOXENV=py33-django16 - TOXENV=py33-django17 - - TOXENV=py33-django18 - TOXENV=py34-django15 - TOXENV=py34-django16 - TOXENV=py34-django17 - TOXENV=py34-django18 + - TOXENV=py34-django19 + - TOXENV=py35-django18 + - TOXENV=py35-django19 - TOXENV=flake8 - TOXENV=sphinx - TOXENV=readme diff --git a/demo/demoproject/http/views.py b/demo/demoproject/http/views.py index c8e1057..dc1e7b5 100644 --- a/demo/demoproject/http/views.py +++ b/demo/demoproject/http/views.py @@ -4,7 +4,8 @@ from django_downloadview import HTTPDownloadView class SimpleURLDownloadView(HTTPDownloadView): def get_url(self): """Return URL of hello-world.txt file on GitHub.""" - return 'https://raw.githubusercontent.com/benoitbryon/django-downloadview' \ + return 'https://raw.githubusercontent.com' \ + '/benoitbryon/django-downloadview' \ '/b7f660c5e3f37d918b106b02c5af7a887acc0111' \ '/demo/demoproject/download/fixtures/hello-world.txt' diff --git a/demo/demoproject/wsgi.py b/demo/demoproject/wsgi.py index 8b54e15..6135784 100755 --- a/demo/demoproject/wsgi.py +++ b/demo/demoproject/wsgi.py @@ -14,12 +14,14 @@ framework. """ import os +from django.core.wsgi import get_wsgi_application + + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "%s.settings" % __package__) # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION # setting points here. -from django.core.wsgi import get_wsgi_application application = get_wsgi_application() # Apply WSGI middleware here. diff --git a/django_downloadview/nginx/response.py b/django_downloadview/nginx/response.py index 727db2c..4bbf0d4 100644 --- a/django_downloadview/nginx/response.py +++ b/django_downloadview/nginx/response.py @@ -29,6 +29,5 @@ class XAccelRedirectResponse(ProxiedDownloadResponse): elif expires is not None: # We explicitely want it off. self['X-Accel-Expires'] = 'off' if limit_rate is not None: - self['X-Accel-Limit-Rate'] = (limit_rate - and '%d' % limit_rate - or 'off') + self['X-Accel-Limit-Rate'] = \ + limit_rate and '%d' % limit_rate or 'off' diff --git a/django_downloadview/test.py b/django_downloadview/test.py index 627adb5..08f6ce9 100644 --- a/django_downloadview/test.py +++ b/django_downloadview/test.py @@ -150,8 +150,8 @@ class DownloadResponseValidator(object): 'attachment;' in response['Content-Disposition']) else: test_case.assertTrue( - 'Content-Disposition' not in response - or 'attachment;' not in response['Content-Disposition']) + 'Content-Disposition' not in response or + 'attachment;' not in response['Content-Disposition']) def assert_download_response(test_case, response, **assertions): diff --git a/docs/about/alternatives.txt b/docs/about/alternatives.txt index 9445750..140ce87 100644 --- a/docs/about/alternatives.txt +++ b/docs/about/alternatives.txt @@ -75,6 +75,6 @@ Here are main differences between the two projects: .. target-notes:: .. _`django.contrib.staticfiles provides a view to serve files`: - https://docs.djangoproject.com/en/1.6/ref/contrib/staticfiles/#static-file-development-view + https://docs.djangoproject.com/en/1.9/ref/contrib/staticfiles/#static-file-development-view .. _`Django ticket #2131`: https://code.djangoproject.com/ticket/2131 .. _`django-sendfile`: http://pypi.python.org/pypi/django-sendfile