From 0bbc10a5fc2df7882f40db809d85f2fbd8559bf4 Mon Sep 17 00:00:00 2001 From: Steve Lamb Date: Mon, 24 Mar 2014 13:16:57 -0400 Subject: [PATCH] Support Python 2.6 --- .travis.yml | 1 + djqscsv/djqscsv.py | 11 ++++++----- setup.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e56064..876e234 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: python python: + - "2.6" - "2.7" env: - DJANGO=1.5 RUNNER="coverage run --source=djqscsv" SUCCESS="coveralls" diff --git a/djqscsv/djqscsv.py b/djqscsv/djqscsv.py index 7cfdeed..c62d075 100644 --- a/djqscsv/djqscsv.py +++ b/djqscsv/djqscsv.py @@ -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: diff --git a/setup.py b/setup.py index 66cfc12..b0eb161 100644 --- a/setup.py +++ b/setup.py @@ -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,