Skip to content

Ensure compatibility with Django>=1.10 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
panioglovadim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure compatibility with Django>=1.10 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions revsquare_sphinx/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.conf import settings
from django.conf.urls import patterns, url, include
from django.conf.urls import url
from django.contrib.auth.decorators import login_required
from django.views.static import serve as static_serve

Expand All @@ -12,9 +12,10 @@ def get_document_root():
:rtype: string
"""
return settings.SPHINX_ROOT
urlpatterns = patterns('',
(r'^$', login_required(static_serve), {

urlpatterns = [
url(r'^$', login_required(static_serve), {
'path': 'index.html', 'document_root': get_document_root()}),
(r'(?P<path>.*)$', login_required(static_serve), {
'document_root': get_document_root()}))
url(r'(?P<path>.*)$', login_required(static_serve), {
'document_root': get_document_root()})
]