Skip to content

Commit 8415f25

Browse files
committed
resolve #20: remove RemovedInDjango110Warning
1 parent 78874d4 commit 8415f25

File tree

4 files changed

+35
-26
lines changed

4 files changed

+35
-26
lines changed

mysite/settings.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
'django.contrib.auth.middleware.AuthenticationMiddleware',
5252
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
5353
'django.contrib.messages.middleware.MessageMiddleware',
54-
'django.middleware.clickjacking.XFrameOptionsMiddleware',
54+
'django.middleware.clickjacking.XFrameOptionsMiddleware'
5555
)
5656

5757
ROOT_URLCONF = 'mysite.urls'
@@ -69,6 +69,23 @@
6969
}
7070
}
7171

72+
TEMPLATES = [
73+
{
74+
'BACKEND': 'django.template.backends.django.DjangoTemplates',
75+
'DIRS': [os.path.join(BASE_DIR, 'templates')],
76+
'APP_DIRS': True,
77+
'OPTIONS': {
78+
'context_processors': [
79+
'django.template.context_processors.debug',
80+
'django.template.context_processors.request',
81+
'django.contrib.auth.context_processors.auth',
82+
'django.contrib.messages.context_processors.messages',
83+
],
84+
},
85+
},
86+
]
87+
88+
7289
# Internationalization
7390
# https://docs.djangoproject.com/en/1.7/topics/i18n/
7491

mysite/urls.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from django.conf.urls import patterns, include, url
1+
from django.conf.urls import include, url
22
from django.contrib import admin
33

44

5-
urlpatterns = patterns(
6-
'',
5+
urlpatterns = [
76
url(r'^admin/', include(admin.site.urls)),
87
url(r'^polls/', include('polls.urls'))
9-
)
8+
]

polls/urls.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from django.conf.urls import patterns, url
1+
from django.conf.urls import url
22
from polls import views
33

44

5-
urlpatterns = patterns(
6-
'',
5+
urlpatterns = [
76
url(r'^$', views.upload, name='uplink'),
87
url(r'^download/(.*)', views.download, name="download"),
98
url(r'^download_attachment/(.*)/(.*)', views.download_as_attachment,
@@ -13,4 +12,4 @@
1312
url(r'^import/', views.import_data, name="import"),
1413
url(r'^import_sheet/', views.import_sheet, name="import_sheet"),
1514
url(r'^export/(.*)', views.export_data, name="export")
16-
)
15+
]

polls/views.py

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
from django.shortcuts import render_to_response
1+
from django.shortcuts import render
22
from django.http import HttpResponseBadRequest, JsonResponse, HttpResponse
33
from django import forms
4-
from django.template import RequestContext
54
import django_excel as excel
65
from polls.models import Question, Choice
76

8-
# No longer you need the following import statements if you use pyexcel >=0.2.2
9-
import pyexcel.ext.xls
10-
import pyexcel.ext.xlsx
11-
import pyexcel.ext.ods3 # noqa
12-
13-
147
data = [
158
[1, 2, 3],
169
[4, 5, 6]
@@ -31,15 +24,15 @@ def upload(request):
3124
file_name="download")
3225
else:
3326
form = UploadFileForm()
34-
return render_to_response(
27+
return render(
28+
request,
3529
'upload_form.html',
3630
{
3731
'form': form,
3832
'title': 'Excel file upload and download example',
3933
'header': ('Please choose any excel file ' +
4034
'from your cloned repository:')
41-
},
42-
context_instance=RequestContext(request))
35+
})
4336

4437

4538
def download(request, file_type):
@@ -97,14 +90,14 @@ def choice_func(row):
9790
return HttpResponseBadRequest()
9891
else:
9992
form = UploadFileForm()
100-
return render_to_response(
93+
return render(
94+
request,
10195
'upload_form.html',
10296
{
10397
'form': form,
10498
'title': 'Import excel data into database example',
10599
'header': 'Please upload sample-data.xls:'
106-
},
107-
context_instance=RequestContext(request))
100+
})
108101

109102

110103
def import_sheet(request):
@@ -121,9 +114,10 @@ def import_sheet(request):
121114
return HttpResponseBadRequest()
122115
else:
123116
form = UploadFileForm()
124-
return render_to_response('upload_form.html',
125-
{'form': form},
126-
context_instance=RequestContext(request))
117+
return render(
118+
request,
119+
'upload_form.html',
120+
{'form': form})
127121

128122

129123
def exchange(request, file_type):

0 commit comments

Comments
 (0)