Skip to content

Commit

Permalink
Rename Python package from sendfile to django_sendfile (#24)
Browse files Browse the repository at this point in the history
Fixes #2
  • Loading branch information
moggers87 authored Nov 30, 2019
1 parent aae78df commit 0c93b11
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[run]
branch = true
source = sendfile
source = django_sendfile
omit =
*/_version.py
*/tests.py
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
8 changes: 8 additions & 0 deletions django_sendfile/__init__.py
Original file line number Diff line number Diff line change
@@ -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("."))
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 0 additions & 9 deletions sendfile/__init__.py → django_sendfile/sendfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
10 changes: 5 additions & 5 deletions sendfile/tests.py → django_sendfile/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -42,7 +42,7 @@ class TestSendfile(TempFileTestCase):
def setUp(self):
super(TestSendfile, self).setUp()
# set ourselves to be the sendfile backend
settings.SENDFILE_BACKEND = 'sendfile.tests'
settings.SENDFILE_BACKEND = 'django_sendfile.tests'
_get_sendfile.clear()

def _get_readme(self):
Expand Down Expand Up @@ -105,7 +105,7 @@ class TestXSendfileBackend(TempFileTestCase):

def setUp(self):
super(TestXSendfileBackend, self).setUp()
settings.SENDFILE_BACKEND = 'sendfile.backends.xsendfile'
settings.SENDFILE_BACKEND = 'django_sendfile.backends.xsendfile'
_get_sendfile.clear()

def test_correct_file_in_xsendfile_header(self):
Expand All @@ -125,7 +125,7 @@ class TestNginxBackend(TempFileTestCase):

def setUp(self):
super(TestNginxBackend, self).setUp()
settings.SENDFILE_BACKEND = 'sendfile.backends.nginx'
settings.SENDFILE_BACKEND = 'django_sendfile.backends.nginx'
settings.SENDFILE_ROOT = self.TEMP_FILE_ROOT
settings.SENDFILE_URL = '/private'
_get_sendfile.clear()
Expand All @@ -147,7 +147,7 @@ class TestModWsgiBackend(TempFileTestCase):

def setUp(self):
super(TestModWsgiBackend, self).setUp()
settings.SENDFILE_BACKEND = 'sendfile.backends.mod_wsgi'
settings.SENDFILE_BACKEND = 'django_sendfile.backends.mod_wsgi'
settings.SENDFILE_ROOT = self.TEMP_FILE_ROOT
settings.SENDFILE_URL = '/private'
_get_sendfile.clear()
Expand Down
2 changes: 1 addition & 1 deletion examples/protected_downloads/download/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions examples/protected_downloads/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@
'django.contrib.admin',
'django.contrib.messages',
'download',
'sendfile',
'django_sendfile',
)


# SENDFILE settings
SENDFILE_BACKEND = 'sendfile.backends.development'
# SENDFILE_BACKEND = 'sendfile.backends.xsendfile'
# SENDFILE_BACKEND = 'sendfile.backends.nginx'
SENDFILE_BACKEND = 'django_sendfile.backends.development'
# SENDFILE_BACKEND = 'django_sendfile.backends.xsendfile'
# SENDFILE_BACKEND = 'django_sendfile.backends.nginx'
SENDFILE_ROOT = os.path.join(PROJECT_ROOT, 'protected')
SENDFILE_URL = '/protected'
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 0c93b11

Please sign in to comment.