Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 11 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,16 @@


class APP(Resource):

def get(self):
return {'this is soon to become an awesome->': 'website'}


def post(self):
jk = joke.getJoke()
jk = jk.encode('ascii', 'ignore').decode('ascii')
#jk = jk.encode('utf-8')
return jk
return joke.getJoke()


class API(Resource):

def get(self):
jk = joke.getJoke()
jk = jk.encode('ascii', 'ignore').decode('ascii')
# jk = jk.encode('utf-8')
return jk
return joke.getJoke()


api.add_resource(APP, '/')
Expand Down
14 changes: 4 additions & 10 deletions joke.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
# -*- coding: utf-8 -*-
import json
from random import *
from random import randint


def random_digits(joke_count):
# Return a joke index between first and last joke in data
return randint(1, joke_count)

def get_joke():
# Return random joke
def getJoke():
# return a random joke loaded from the data.json
with open('data.json') as data_file:
data = json.load(data_file)
joke = data[random_digits(len(data))]
print joke
return joke
return data[randint(0, len(data) - 1)]