holidayapi/holidayapi-python
1
0
Fork 0
mirror of https://github.com/holidayapi/holidayapi-python.git synced 2025-06-21 12:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make code work with python 3.x

Browse source 
also some minor code refactor
This commit is contained in:
Kevad 2017-05-18 16:47:45 +02:00 • committed by GitHub
parent 5fabca70a2
commit 15e629786a
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
holidayapi/__init__.py
View file

@ -2,23 +2,22 @@ import json
import requests import requests
class v1: class v1:
key = None
def __init__(self, key): def __init__(self, key):
self.key = key self.key = key
def holidays(self, parameters): def holidays(self, parameters):
url = 'https://holidayapi.com/v1/holidays?' url = 'https://holidayapi.com/v1/holidays?'
if parameters.has_key('key') is False: if not parameters.get('key'):
parameters['key'] = self.key parameters['key'] = self.key
else:
assert self.key == parameters['key'], 'keys supplied as an argument & in `parameters` differ. \n Provide at only one place'
response = requests.get(url, params=parameters); response = requests.get(url, params=parameters);
data = json.loads(response.text) data = response.json()
if response.status_code != 200: if not response.ok:
if data.has_key('error') is False: if not data.get('error'):
data['error'] = 'Unknown error.' data['error'] = 'Unknown error.'
return data return data