diff --git a/.travis.yml b/.travis.yml index 26995c4..43f001c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,10 @@ language: python dist: xenial python: - - "2.7" - "3.5" - "3.6" - "3.7" - "3.8" - - pypy2.7-6.0 - pypy3.5-6.0 install: travis_retry pip install -q tox diff --git a/sendfile/__init__.py b/sendfile/__init__.py index 7897507..34d1188 100644 --- a/sendfile/__init__.py +++ b/sendfile/__init__.py @@ -8,7 +8,6 @@ from django.http import Http404 from django.utils.encoding import force_text from django.utils.http import urlquote -import six from ._version import get_versions @@ -89,10 +88,7 @@ def sendfile(request, filename, attachment=False, attachment_filename=None, if attachment_filename: attachment_filename = force_text(attachment_filename) ascii_filename = unicodedata.normalize('NFKD', attachment_filename) - ascii_filename = ascii_filename.encode('ascii', 'ignore') - - if six.PY3: - ascii_filename = ascii_filename.decode() + ascii_filename = ascii_filename.encode('ascii', 'ignore').decode() parts.append('filename="%s"' % ascii_filename) if ascii_filename != attachment_filename: diff --git a/sendfile/backends/xsendfile.py b/sendfile/backends/xsendfile.py index 7bf472e..74993ee 100644 --- a/sendfile/backends/xsendfile.py +++ b/sendfile/backends/xsendfile.py @@ -1,12 +1,8 @@ from django.http import HttpResponse -import six def sendfile(request, filename, **kwargs): - filename = six.text_type(filename) - if six.PY2: - filename = filename.encode("utf-8") - + filename = str(filename) response = HttpResponse() response['X-Sendfile'] = filename diff --git a/setup.py b/setup.py index 7d7a149..ca5985e 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ url='https://github.com/moggers87/django-sendfile2', license='BSD', - install_requires=['django', 'six'], + install_requires=['django'], packages=['sendfile', 'sendfile.backends'], package_dir={ 'sendfile': 'sendfile', @@ -35,8 +35,6 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', diff --git a/tox.ini b/tox.ini index 2fa9815..bd20b0e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,11 @@ [tox] envlist = - py{py,27,py3,35,36,37}-django111 py{py3,35,36,37,38}-django{21,22} flake8 [testenv] usedevelop=True deps = - django111: Django>=1.11,<1.12 django21: Django>=2.1,<2.2 django22: Django>=2.2,<2.3 changedir = examples/protected_downloads