Skip to content

Fixed import - and PY3 #83

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

Fixed import - and PY3 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be4ff19
Fixed import - and PY3
ar45 Jan 17, 2016
0165ae4
Support python 3.2
ar45 Jan 17, 2016
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
2 changes: 1 addition & 1 deletion djqscsv/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from djqscsv import (render_to_csv_response, write_csv, # NOQA
from .djqscsv import (render_to_csv_response, write_csv, # NOQA
generate_filename, CSVException) # NOQA
12 changes: 6 additions & 6 deletions djqscsv/djqscsv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def write_csv(queryset, file_obj, **kwargs):
csv_kwargs[key] = val

# add BOM to support CSVs in MS Excel (for Windows only)
file_obj.write(_safe_utf8_stringify(u'\ufeff'))
file_obj.write(_safe_utf8_stringify(six.u('\ufeff')))

# the CSV must always be built from a values queryset
# in order to introspect the necessary fields.
Expand Down Expand Up @@ -134,7 +134,7 @@ def generate_filename(queryset, append_datestamp=False):
Takes a queryset and returns a default
base filename based on the underlying model
"""
base_filename = slugify(unicode(queryset.model.__name__)) + '_export.csv'
base_filename = slugify(six.text_type(queryset.model.__name__)) + '_export.csv'

if append_datestamp:
base_filename = _append_datestamp(base_filename)
Expand All @@ -154,17 +154,17 @@ def _validate_and_clean_filename(filename):
else:
filename = filename[:-4]

filename = slugify(unicode(filename)) + '.csv'
filename = slugify(six.text_type(filename)) + '.csv'
return filename


def _safe_utf8_stringify(value):
if isinstance(value, str):
return value
elif isinstance(value, unicode):
elif isinstance(value, six.text_type):
return value.encode('utf-8')
else:
return unicode(value).encode('utf-8')
return six.text_type(value).encode('utf-8')


def _sanitize_unicode_record(field_serializer_map, record):
Expand All @@ -175,7 +175,7 @@ def _serialize_value(value):
if isinstance(value, datetime.datetime):
return value.isoformat()
else:
return unicode(value)
return six.text_type(value)

obj = {}
for key, val in six.iteritems(record):
Expand Down