Skip to content

Commit d9c32ce

Browse files
committed
teapot on /tea db on /db
1 parent e3fa1e6 commit d9c32ce

4 files changed

Lines changed: 48 additions & 1 deletion

File tree

‎gettingstarted/urls.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
urlpatterns = [
1313
url(r'^$', hello.views.index, name='index'),
14+
url(r'^tea', hello.views.tea, name='tea'),
1415
url(r'^db', hello.views.db, name='db'),
1516
url(r'^admin/', include(admin.site.urls)),
1617
]

‎gettingstarted/urls.py~‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
from django.conf.urls import include, url
2+
3+
from django.contrib import admin
4+
admin.autodiscover()
5+
6+
import hello.views
7+
8+
# Examples:
9+
# url(r'^$', 'gettingstarted.views.home', name='home'),
10+
# url(r'^blog/', include('blog.urls')),
11+
12+
urlpatterns = [
13+
url(r'^$', hello.views.index, name='index'),
14+
url(r'^db', hello.views.db, name='db'),
15+
url(r'^admin/', include(admin.site.urls)),
16+
]

‎hello/views.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
from django.shortcuts import render
22
from django.http import HttpResponse
3-
3+
import requests
44
from .models import Greeting
55

66
# Create your views here.
77
def index(request):
88
# return HttpResponse('Hello from Python!')
99
return render(request, 'index.html')
10+
def tea(request):
11+
r = requests.get('http://httpbin.org/status/418')
12+
print r.text
13+
return HttpResponse('<pre>' + r.text + '</pre>')
1014

1115

1216
def db(request):
@@ -18,3 +22,4 @@ def db(request):
1822

1923
return render(request, 'db.html', {'greetings': greetings})
2024

25+

‎hello/views.py~‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from django.shortcuts import render
2+
from django.http import HttpResponse
3+
import requests
4+
from .models import Greeting
5+
6+
# Create your views here.
7+
# def index(request):
8+
# # return HttpResponse('Hello from Python!')
9+
# return render(request, 'index.html')
10+
def index(request):
11+
r = requests.get('http://httpbin.org/status/418')
12+
print r.text
13+
return HttpResponse('<pre>' + r.text + '</pre>')
14+
15+
16+
def db(request):
17+
18+
greeting = Greeting()
19+
greeting.save()
20+
21+
greetings = Greeting.objects.all()
22+
23+
return render(request, 'db.html', {'greetings': greetings})
24+
25+

0 commit comments

Comments
 (0)