Skip to content

Added missing declarations in constructor and modified error handling… #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r8vnhill wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added missing declarations in constructor and modified error handling… #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions darksky/forecast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# forecast.py
from __future__ import print_function
from builtins import super

import json
import sys
from builtins import super

import requests

from .data import DataPoint
Expand All @@ -12,8 +12,14 @@


class Forecast(DataPoint):

def __init__(self, key, latitude, longitude, time=None, timeout=None, **queries):
self._parameters = dict(key=key, latitude=latitude, longitude=longitude, time=time)
super(Forecast, self).__init__({})
self._queries = None
self.timeout = None
self.response_headers = None
self._parameters = dict(key=key, latitude=latitude, longitude=longitude,
time=time)
self.refresh(timeout, **queries)

def __setattr__(self, key, value):
Expand All @@ -31,7 +37,7 @@ def __getattr__(self, key):
def __enter__(self):
return self

def __exit__(self, type, value, tb):
def __exit__(self, exit_type, value, tb):
del self

@property
Expand All @@ -52,6 +58,5 @@ def refresh(self, timeout=None, **queries):

response = requests.get(self.url, **request_params)
self.response_headers = response.headers
if response.status_code is not 200:
raise requests.exceptions.HTTPError('Bad response')
response.raise_for_status()
return super().__init__(json.loads(response.text))