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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: python
python:
- "2.6"
- "2.7"
env:
- DJANGO=1.5 RUNNER="coverage run --source=djqscsv" SUCCESS="coveralls"
Expand Down
11 changes: 6 additions & 5 deletions djqscsv/djqscsv.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,19 @@ def write_csv(queryset, file_obj, field_header_map=None,

# verbose_name defaults to the raw field name, so in either case
# this will produce a complete mapping of field names to column names
name_map = {field: field for field in field_names}
name_map = dict((field, field) for field in field_names)
if use_verbose_names:
name_map.update({field.name: unicode(field.verbose_name)
for field in queryset.model._meta.fields
if field.name in field_names})
name_map.update(
dict((field.name, unicode(field.verbose_name))
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
_field_header_map = field_header_map or {}
merged_header_map = name_map.copy()
merged_header_map.update(_field_header_map)
if extra_columns:
merged_header_map.update({k: k for k in extra_columns})
merged_header_map.update(dict((k, k) for k in extra_columns))
writer.writerow(merged_header_map)

for record in values_qs:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name='django-queryset-csv',
version='0.2.7',
version='0.2.8',
description='A simple python module for writing querysets to csv',
long_description=open('README.rst').read(),
author=author,
Expand Down