remove document_root argument #758

Merged
merged 1 commit into from Feb 23, 2013

Conversation

Projects
None yet
2 participants
@ghost

ghost commented Feb 23, 2013

Removes document_root from django.contrib.staticfiles.views.serve.

This argument can be removed, because the new way of finding static files doesn't take document_root into account at all.

fako Removes document_root argument from django.contrib.staticfiles.views.…
…serve

This argument can be removed, because the new way of finding static files doesn't take document_root into account at all.
2db9cbe

@jezdez jezdez added a commit that referenced this pull request Feb 23, 2013

@jezdez jezdez Merge pull request #758 from FakoTB/master
Fixed #19572 - Remove document_root argument from staticfiles views.
bb2705d

@jezdez jezdez merged commit bb2705d into django:master Feb 23, 2013

By doing this you seem to be preventing the use of alternate document roots.

In particular you prevent uses like this

        url(r'^Ext/(?P<path>.*)$', static_view,
            {"document_root": path.join(settings.PROJECT_ROOT, "Ext"),}),

Because now you can end up passing document_root twice to static.serve

serve() got multiple values for keyword argument 'document_root'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment