Skip to content

Update to support Django 1.9 ValuesIterable #80

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

Closed
wants to merge 2 commits into from
Closed

Update to support Django 1.9 ValuesIterable #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8331efc
Update to support Django 1.9 ValuesIterable
adonm Dec 18, 2015
0eea475
tweaks for 1.9 compat
dbca-asi Dec 18, 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
42 changes: 10 additions & 32 deletions djqscsv/djqscsv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
from django.http import HttpResponse

from django.conf import settings
if not settings.configured:
# required to import ValuesQuerySet
settings.configure() # pragma: no cover

from django.db.models.query import ValuesQuerySet

from django.utils import six

Expand Down Expand Up @@ -74,27 +69,18 @@ def write_csv(queryset, file_obj, **kwargs):

# the CSV must always be built from a values queryset
# in order to introspect the necessary fields.
if isinstance(queryset, ValuesQuerySet):
values_qs = queryset
if len(queryset) > 0:
if not hasattr(queryset[0], "keys"):
try:
values_qs = queryset.values()
except AttributeError:
raise CSVException("This doesn't look like a QuerySet or ValuesIterable")
else:
values_qs = queryset
field_names = values_qs[0].keys()
else:
values_qs = queryset.values()

try:
field_names = values_qs.field_names

except AttributeError:
# in django1.5, empty querysets trigger
# this exception, but not django 1.6
raise CSVException("Empty queryset provided to exporter.")

extra_columns = list(values_qs.query.extra_select)
if extra_columns:
field_names += extra_columns

aggregate_columns = list(values_qs.query.aggregate_select)
if aggregate_columns:
field_names += aggregate_columns

if field_order:
# go through the field_names and put the ones
# that appear in the ordering list first
Expand All @@ -114,15 +100,7 @@ def write_csv(queryset, file_obj, **kwargs):
for field in queryset.model._meta.fields
if field.name in field_names))

# merge the custom field headers into the verbose/raw defaults, if provided
merged_header_map = name_map.copy()
if extra_columns:
merged_header_map.update(dict((k, k) for k in extra_columns))
merged_header_map.update(field_header_map)

merged_header_map = dict((k, _safe_utf8_stringify(v))
for (k, v) in merged_header_map.items())
writer.writerow(merged_header_map)
writer.writerow(name_map)

for record in values_qs:
record = _sanitize_unicode_record(field_serializer_map, record)
Expand Down