Skip to content

Commit a533ab1

Browse files
committed
A little cleanup too.
1 parent a45408d commit a533ab1

File tree

1 file changed

+15
-8
lines changed
  • days/017-020-flask-call-apis/code/program

1 file changed

+15
-8
lines changed
Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
1-
from flask import render_template, request
2-
from program import app
31
from datetime import datetime
4-
from pprint import pprint
2+
53
import requests
4+
from flask import render_template, request
5+
6+
from program import app
7+
8+
time_now = str(datetime.today())
69

7-
timenow = str(datetime.today())
810

911
@app.route('/')
1012
@app.route('/index')
1113
def index():
12-
return render_template('index.html', title='Template Demo', time=timenow)
14+
return render_template('index.html', title='Template Demo', time=time_now)
15+
1316

1417
@app.route('/100Days')
1518
def p100days():
1619
return render_template('100Days.html')
1720

21+
1822
@app.route('/chuck')
1923
def chuck():
2024
joke = get_chuck_joke()
2125
return render_template('chuck.html',
22-
joke=joke)
26+
joke=joke)
27+
2328

2429
@app.route('/pokemon', methods=['GET', 'POST'])
2530
def pokemon():
@@ -28,19 +33,21 @@ def pokemon():
2833
colour = request.form.get('pokecolour')
2934
pokemon = get_poke_colours(colour)
3035
return render_template('pokemon.html',
31-
pokemon=pokemon)
36+
pokemon=pokemon)
37+
3238

3339
def get_chuck_joke():
3440
r = requests.get('https://api.chucknorris.io/jokes/random')
3541
data = r.json()
3642
return data['value']
3743

44+
3845
def get_poke_colours(colour):
3946
r = requests.get('https://pokeapi.co/api/v2/pokemon-color/' + colour.lower())
4047
pokedata = r.json()
4148
pokemon = []
4249

4350
for i in pokedata['pokemon_species']:
4451
pokemon.append(i['name'])
45-
52+
4653
return pokemon

0 commit comments

Comments
 (0)