diff --git a/.coveragerc b/.coveragerc index 0814f7a..3477cac 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,6 @@ [run] branch = true -source = sendfile +source = django_sendfile omit = */_version.py */tests.py diff --git a/README.rst b/README.rst index 61f0bb9..a8888dd 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,7 @@ object. :: - from sendfile import sendfile + from django_sendfile import sendfile # send myfile.pdf to user return sendfile(request, '/home/john/myfile.pdf') diff --git a/django_sendfile/__init__.py b/django_sendfile/__init__.py new file mode 100644 index 0000000..cf92cb6 --- /dev/null +++ b/django_sendfile/__init__.py @@ -0,0 +1,8 @@ +from .sendfile import sendfile # noqa +from ._version import get_versions + +__version__ = get_versions()['version'] +del get_versions + +# old versions of django-sendfile have this, so keep it for compatibility +VERSION = tuple(__version__.split("+")[0].split(".")) diff --git a/sendfile/_version.py b/django_sendfile/_version.py similarity index 100% rename from sendfile/_version.py rename to django_sendfile/_version.py diff --git a/sendfile/backends/__init__.py b/django_sendfile/backends/__init__.py similarity index 100% rename from sendfile/backends/__init__.py rename to django_sendfile/backends/__init__.py diff --git a/sendfile/backends/_internalredirect.py b/django_sendfile/backends/_internalredirect.py similarity index 100% rename from sendfile/backends/_internalredirect.py rename to django_sendfile/backends/_internalredirect.py diff --git a/sendfile/backends/development.py b/django_sendfile/backends/development.py similarity index 100% rename from sendfile/backends/development.py rename to django_sendfile/backends/development.py diff --git a/sendfile/backends/mod_wsgi.py b/django_sendfile/backends/mod_wsgi.py similarity index 100% rename from sendfile/backends/mod_wsgi.py rename to django_sendfile/backends/mod_wsgi.py diff --git a/sendfile/backends/nginx.py b/django_sendfile/backends/nginx.py similarity index 100% rename from sendfile/backends/nginx.py rename to django_sendfile/backends/nginx.py diff --git a/sendfile/backends/simple.py b/django_sendfile/backends/simple.py similarity index 100% rename from sendfile/backends/simple.py rename to django_sendfile/backends/simple.py diff --git a/sendfile/backends/xsendfile.py b/django_sendfile/backends/xsendfile.py similarity index 100% rename from sendfile/backends/xsendfile.py rename to django_sendfile/backends/xsendfile.py diff --git a/sendfile/models.py b/django_sendfile/models.py similarity index 100% rename from sendfile/models.py rename to django_sendfile/models.py diff --git a/sendfile/__init__.py b/django_sendfile/sendfile.py similarity index 93% rename from sendfile/__init__.py rename to django_sendfile/sendfile.py index 37c511e..b3b21cc 100644 --- a/sendfile/__init__.py +++ b/django_sendfile/sendfile.py @@ -9,15 +9,6 @@ from django.utils.encoding import force_str from django.utils.http import urlquote -from ._version import get_versions - -__version__ = get_versions()['version'] -del get_versions - - -# old versions of django-sendfile have this, so keep it for compatibility -VERSION = tuple(__version__.split("+")[0].split(".")) - def _lazy_load(fn): _cached = [] diff --git a/sendfile/tests.py b/django_sendfile/tests.py similarity index 98% rename from sendfile/tests.py rename to django_sendfile/tests.py index 9bc40d7..c375529 100644 --- a/sendfile/tests.py +++ b/django_sendfile/tests.py @@ -10,7 +10,7 @@ from django.test import TestCase from django.utils.encoding import smart_str -from sendfile import sendfile as real_sendfile, _get_sendfile +from django_sendfile.sendfile import sendfile as real_sendfile, _get_sendfile def sendfile(request, filename, **kwargs): diff --git a/examples/protected_downloads/download/views.py b/examples/protected_downloads/download/views.py index e99b6bc..36f8200 100644 --- a/examples/protected_downloads/download/views.py +++ b/examples/protected_downloads/download/views.py @@ -4,7 +4,7 @@ from django.db.models import Q from django.template import RequestContext -from sendfile import sendfile +from django_sendfile import sendfile from .models import Download diff --git a/examples/protected_downloads/settings.py b/examples/protected_downloads/settings.py index 4048046..66482b9 100644 --- a/examples/protected_downloads/settings.py +++ b/examples/protected_downloads/settings.py @@ -87,7 +87,7 @@ 'django.contrib.admin', 'django.contrib.messages', 'download', - 'sendfile', + 'django_sendfile', ) diff --git a/setup.py b/setup.py index ca5985e..3e182d5 100644 --- a/setup.py +++ b/setup.py @@ -18,13 +18,13 @@ license='BSD', install_requires=['django'], - packages=['sendfile', 'sendfile.backends'], + packages=['django_sendfile', 'django_sendfile.backends'], package_dir={ - 'sendfile': 'sendfile', - 'sendfile.backends': 'sendfile/backends', + 'django_sendfile': 'django_sendfile', + 'django_sendfile.backends': 'django_sendfile/backends', }, package_data={ - 'sendfile': ['testfile.txt'], + 'django_sendfile': ['testfile.txt'], }, zip_safe=True, diff --git a/tox.ini b/tox.ini index 1e8d412..14324db 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ deps = changedir = examples/protected_downloads commands = python --version - coverage run --rcfile=../../.coveragerc -a manage.py test sendfile {posargs} + coverage run --rcfile=../../.coveragerc -a manage.py test django_sendfile {posargs} [travis] python =