From 4551946404547661ab9dbeaa253a8682063ed5a3 Mon Sep 17 00:00:00 2001 From: Steve Lamb Date: Mon, 27 Jan 2014 10:15:07 -0500 Subject: [PATCH] Use django custom six module Try to use django's six instead of cutting out six entirely, as proposed by: https://github.com/azavea/django-queryset-csv/pull/30 https://github.com/steventlamb/django-queryset-csv/commit/ab1bd3c0cb01148518887760e4fc290c622b0518 --- djqscsv/djqscsv.py | 2 +- setup.py | 3 +-- test_app/djqscsv_tests/tests.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/djqscsv/djqscsv.py b/djqscsv/djqscsv.py index 32f30cd..dfb6a25 100644 --- a/djqscsv/djqscsv.py +++ b/djqscsv/djqscsv.py @@ -13,7 +13,7 @@ from django.db.models.query import ValuesQuerySet -import six +from django.utils import six """ A simple python package for turning django models into csvs """ diff --git a/setup.py b/setup.py index ab51faf..c981187 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,5 @@ "Framework :: Django", "License :: OSI Approved :: GNU General Public License (GPL)" ], - install_requires=['django>=1.5', - 'six==1.5'], + install_requires=['django>=1.5'], ) diff --git a/test_app/djqscsv_tests/tests.py b/test_app/djqscsv_tests/tests.py index 6e65d38..5b30558 100644 --- a/test_app/djqscsv_tests/tests.py +++ b/test_app/djqscsv_tests/tests.py @@ -11,7 +11,7 @@ from .util import create_people_and_get_queryset -import six +from django.utils import six if six.PY3: from functools import filter