Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions changelog.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: django-excel
organisation: pyexcel-webwares
releases:
- changes:
- action: 'Change:'
details:
- Replace pkg_resources-based Django version check with django.get_version()
- Exclude .venv from flake8 check to simplify development
date: 31.10.2025
version: 0.0.13
- changes:
- action: 'Change:'
details:
Expand Down
26 changes: 14 additions & 12 deletions django_excel/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
"""
django_excel
~~~~~~~~~~~~~~~~~~~
django_excel
~~~~~~~~~~~~~~~~~~~

A django middleware that provides one application programming interface
to read and write data in different excel file formats
A django middleware that provides one application programming interface
to read and write data in different excel file formats

:copyright: (c) 2015 by Onni Software Ltd.
:license: New BSD License
:copyright: (c) 2015 by Onni Software Ltd.
:license: New BSD License
"""

import pyexcel as pe
import pyexcel_webio as webio
from django.core.files.uploadedfile import (
Expand Down Expand Up @@ -174,21 +175,22 @@ def _make_response(content, content_type, status, file_name=None):
if PY2_VERSION and isinstance(file_name, unicode):
file_name = file_name.encode("utf-8")
url_encoded_file_name = urllib_quote(file_name)
response[
"Content-Disposition"
] = "attachment; filename=%s;filename*=utf-8''%s" % (
url_encoded_file_name,
url_encoded_file_name,
response["Content-Disposition"] = (
"attachment; filename=%s;filename*=utf-8''%s"
% (
url_encoded_file_name,
url_encoded_file_name,
)
)
return response


webio.init_webio(_make_response)


from pyexcel_webio import make_response_from_array # noqa
from pyexcel_webio import (
make_response,
make_response_from_array, # noqa
make_response_from_book_dict,
make_response_from_dict,
make_response_from_query_sets,
Expand Down
4 changes: 2 additions & 2 deletions django_excel/_compact.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from distutils.version import LooseVersion

import pkg_resources
from django import get_version

try:
# if in py2
Expand All @@ -14,7 +14,7 @@
PY2_VERSION = False


django_version = pkg_resources.get_distribution("django").version
django_version = get_version()


DJANGO_ONE_SIX = LooseVersion(django_version) < LooseVersion(
Expand Down
2 changes: 1 addition & 1 deletion lint.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pip install flake8
flake8 --exclude=.moban.d,docs,setup.py --ignore=F401,E402,E501,W503 --builtins=unicode,xrange,long . && python setup.py checkdocs
flake8 --exclude=.venv,.moban.d,docs,setup.py --ignore=F401,E402,E501,W503 --builtins=unicode,xrange,long . && python setup.py checkdocs