From 5ebef2222b511da58047a94656f73c4b59b79ff3 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sat, 5 Apr 2014 11:55:37 +0000 Subject: [PATCH 01/79] Small fixes --- setup.py | 2 +- yr/languages/__init__.py | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 yr/languages/__init__.py diff --git a/setup.py b/setup.py index 5f5e904..7e1f4ca 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,6 @@ author='Alexander Hansen, idxxx23 @ github', author_email='alexander.l.hansen@gmail.com', url='https://github.com/wckd/python-yr', - packages=['yr'], + packages=['yr', 'yr.languages'], install_requires=['requests', 'xmltodict', 'beautifulsoup4'], ) diff --git a/yr/languages/__init__.py b/yr/languages/__init__.py new file mode 100644 index 0000000..e69de29 From f5cf8f9e9b4a7fb137f6aa653ef09c27cd6b8e12 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sat, 5 Apr 2014 12:02:08 +0000 Subject: [PATCH 02/79] packagefix --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7e1f4ca..e6cca3d 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,7 @@ author='Alexander Hansen, idxxx23 @ github', author_email='alexander.l.hansen@gmail.com', url='https://github.com/wckd/python-yr', - packages=['yr', 'yr.languages'], + packages=['yr'], + package_data={'yr': ['languages/*.json']}, install_requires=['requests', 'xmltodict', 'beautifulsoup4'], ) From 2f96a8057cc2d55783ab1862cbb6c1a53300b572 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sat, 5 Apr 2014 12:03:43 +0000 Subject: [PATCH 03/79] fixing path --- yr/libyr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yr/libyr.py b/yr/libyr.py index 0b2c221..11055b9 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 import sys, json -from utils import Location, Connect, Cache, Language +from yr.utils import Location, Connect, Cache, Language class Yr: From fb8235534e14c59810efb5968a33ae62ad91e832 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Thu, 10 Apr 2014 07:23:35 +0200 Subject: [PATCH 04/79] Changed author-format --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e6cca3d..efa62b8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup(name='python-yr', version='1.2.1-dev', description='Get the forecast from the norwegian wheather service yr.no in python', - author='Alexander Hansen, idxxx23 @ github', + author='wckd @ github, idxxx23 @ github', author_email='alexander.l.hansen@gmail.com', url='https://github.com/wckd/python-yr', packages=['yr'], From ce4a8f34f39ad30c7d60576e030a74bc25dcf9ae Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Wed, 23 Apr 2014 08:44:39 +0200 Subject: [PATCH 05/79] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index efa62b8..fe2808c 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='python-yr', - version='1.2.1-dev', + version='1.2.2-dev', description='Get the forecast from the norwegian wheather service yr.no in python', author='wckd @ github, idxxx23 @ github', author_email='alexander.l.hansen@gmail.com', From bed2cb350b40e424da6676b354abfbaa9d4b9353 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Wed, 23 Apr 2014 08:45:16 +0200 Subject: [PATCH 06/79] Delete __init__.py --- yr/languages/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 yr/languages/__init__.py diff --git a/yr/languages/__init__.py b/yr/languages/__init__.py deleted file mode 100644 index e69de29..0000000 From 54e571bc50312c5857eea2b359f9787e315ae830 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Wed, 23 Apr 2014 07:24:03 +0000 Subject: [PATCH 07/79] Some changes to setup --- setup.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/setup.py b/setup.py index e6cca3d..b6ee2c4 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,13 @@ author='Alexander Hansen, idxxx23 @ github', author_email='alexander.l.hansen@gmail.com', url='https://github.com/wckd/python-yr', + classifiers=[ + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'Operating System :: POSIX', + 'Programming Language :: Python', + 'Topic :: Internet', + ] packages=['yr'], package_data={'yr': ['languages/*.json']}, install_requires=['requests', 'xmltodict', 'beautifulsoup4'], From f664d2a2c192030eaf019d3fa714fe7c994495ea Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Wed, 23 Apr 2014 07:25:16 +0000 Subject: [PATCH 08/79] fixed classifiers in setup --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 92b6c21..05851dd 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ 'Operating System :: POSIX', 'Programming Language :: Python', 'Topic :: Internet', - ] + ], packages=['yr'], package_data={'yr': ['languages/*.json']}, install_requires=['requests', 'xmltodict', 'beautifulsoup4'], From 1b7f4f989603d1d57072eee2e5ab47a235c3a58e Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 26 Feb 2014 13:14:14 +0100 Subject: [PATCH 09/79] modify dwnl to urllib.request + change hash function --- yr/examples/client.py | 4 ++-- yr/utils.py | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/yr/examples/client.py b/yr/examples/client.py index 8e51323..d3cd082 100644 --- a/yr/examples/client.py +++ b/yr/examples/client.py @@ -5,7 +5,7 @@ sys.path.append(parent_directory) from libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') -#weather = Yr('Czech_Republic/Prague/Prague') +#weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr('Czech_Republic/Prague/Prague') print(weather.now(as_json=True)) diff --git a/yr/utils.py b/yr/utils.py index e8bcefc..09f65db 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -1,5 +1,8 @@ #!/usr/bin/env python3 -import os.path, sys, json, hashlib, requests, tempfile, datetime +import os.path, sys, json, tempfile, datetime +#import hashlib +#import requests +import urllib.request class Language: @@ -30,7 +33,10 @@ def get_url(self): return result def get_hash(self): + ''' result = hashlib.sha256(self.location_name.encode('utf-8')).hexdigest()[:12] + ''' + result = self.location_name.replace('/', '-') return result class Connect: @@ -41,10 +47,20 @@ def __init__(self, location): def read(self): cache = Cache(self.location, 'forecast') if not cache.exists() or not cache.is_fresh(): + ''' yr = requests.get(self.location.url) if not yr.status_code == requests.codes.ok: yr.raise_for_status() cache.write(yr.text) #.encode('utf-8') $$bug$$ ~> create empty forecast file in my /tmp/ + ''' + who = 'urllib.request' + response = urllib.request.urlopen(self.location.url) + content = response.read() + if response.status != 200: + sys.stderr.write('{} error: {}\n'.format(who, response.status)) + sys.exit(1) + xml = content.decode('utf-8') + cache.write(xml) data = cache.read() return data From 8b4a1c74b81a74065f4c515f428d218036a4df75 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 3 Jun 2014 09:51:35 +0200 Subject: [PATCH 10/79] simplify yr/utils.py --- yr/utils.py | 133 +++++++++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 58 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 09f65db..dee7eb7 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -1,91 +1,108 @@ #!/usr/bin/env python3 -import os.path, sys, json, tempfile, datetime -#import hashlib -#import requests -import urllib.request -class Language: +import os.path +import json # Language +import tempfile # Cache +import datetime # Cache +import urllib.request # Connect +import sys - def __init__(self, language): - self.language = language +class YrObject: encoding = 'utf-8' + +class YrException(YrObject): + + def __init__(self, error_message): + sys.stderr.write('python-yr: {error_message}\n'.format(error_message=error_message)) + sys.exit(1) + +class Language(YrObject): + + script_directory = os.path.dirname(os.path.abspath(__file__)) # directory of the script + directory = 'languages' + + def __init__(self, language_name='en'): + self.language_name = language_name + self.filename = os.path.join( + self.script_directory, + self.directory, + '{root}.{ext}'.format(root=self.language_name, ext='json') # basename of filename + ) + self.dictionary = self.get_dictionary() def get_dictionary(self): - path = os.path.abspath(os.path.dirname(__file__)) - filename = '{}/languages/{}.json'.format(path, self.language) - if os.path.exists(filename): - with open(filename, mode='r', encoding='utf-8') as f: + if os.path.exists(self.filename): + with open(self.filename, mode='r', encoding=self.encoding) as f: return json.load(f) else: - sys.stderr.write('error: unsupported language ~> {}\n'.format(self.language)) - sys.exit(1) + YrException('unavailable language ~> {language_name}'.format(language_name=self.language_name)) -class Location: +class Location(YrObject): - def __init__(self, location_name, language): + def __init__(self, location_name, language_name='en'): self.location_name = location_name - self.language = language - self._ = Language(self.language).get_dictionary() + self.language_name = language_name self.url = self.get_url() self.hash = self.get_hash() def get_url(self): - result = 'http://www.yr.no/{place}/{location_name}/{forecast}.xml'.format(location_name=self.location_name, **self._) - return result + language = Language(self.language_name) + url = 'http://www.yr.no/{place}/{location_name}/{forecast}.xml'.format( + location_name = self.location_name, + **language.dictionary # **language.dictionary contain ~> place + forecast + ) + return url def get_hash(self): - ''' - result = hashlib.sha256(self.location_name.encode('utf-8')).hexdigest()[:12] - ''' - result = self.location_name.replace('/', '-') - return result + return self.location_name.replace('/', '-') -class Connect: +class Connect(YrObject): - def __init__(self, location): - self.location = location + extension = 'weatherdata.xml' + + def __init__(self, location_name, language_name='en'): + self.location_name = location_name + self.language_name = language_name def read(self): - cache = Cache(self.location, 'forecast') + location = Location(self.location_name, self.language_name) + cache = Cache(location, self.extension) if not cache.exists() or not cache.is_fresh(): - ''' - yr = requests.get(self.location.url) - if not yr.status_code == requests.codes.ok: - yr.raise_for_status() - cache.write(yr.text) #.encode('utf-8') $$bug$$ ~> create empty forecast file in my /tmp/ - ''' - who = 'urllib.request' - response = urllib.request.urlopen(self.location.url) - content = response.read() + response = urllib.request.urlopen(location.url) if response.status != 200: - sys.stderr.write('{} error: {}\n'.format(who, response.status)) - sys.exit(1) - xml = content.decode('utf-8') - cache.write(xml) - data = cache.read() - return data + YrException('unavailable url ~> {url}'.format(url=location.url)) + weatherdata = response.read().decode(self.encoding) + cache.dump(weatherdata) + else: + weatherdata = cache.load() + return weatherdata -class Cache: +class Cache(YrObject): - cache_timeout = 30 # cache timeout in minutes + directory = tempfile.gettempdir() + timeout = 30 # cache timeout in minutes def __init__(self, location, what): - self.location = location - self.cache_filename = '{}/{}.{}'.format(tempfile.gettempdir(), self.location.hash, what) + self.filename = os.path.join( + self.directory, + '{root}.{ext}'.format(root=location.hash, ext=what) # basename of filename + ) - def write(self, data): - with open(self.cache_filename, mode='w', encoding='utf-8') as f: + def dump(self, data): + with open(self.filename, mode='w', encoding=self.encoding) as f: f.write(data) def is_fresh(self): - modified = datetime.datetime.fromtimestamp(os.path.getmtime(self.cache_filename)) - result = datetime.datetime.now() - modified <= datetime.timedelta(minutes=self.cache_timeout) - return result + mtime = datetime.datetime.fromtimestamp(os.path.getmtime(self.filename)) + now = datetime.datetime.now() + timeout = datetime.timedelta(minutes=self.timeout) + return mtime - now <= timeout def exists(self): - result = os.path.isfile(self.cache_filename) - return result + return os.path.isfile(self.filename) - def read(self): - with open(self.cache_filename, mode='r', encoding='utf-8') as f: - data = f.read() - return data + def load(self): + with open(self.filename, mode='r', encoding=self.encoding) as f: + return f.read() + +if __name__ == '__main__': + print(Connect('Czech_Republic/Prague/Prague').read()) From 04587d0bd1c8a8b1c4ef06a4c1e7befcb5fc6f6e Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 3 Jun 2014 10:16:30 +0200 Subject: [PATCH 11/79] return object parameters in yr/utils.py --- yr/utils.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index dee7eb7..f23e398 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 +import sys import os.path import json # Language import tempfile # Cache import datetime # Cache import urllib.request # Connect -import sys class YrObject: encoding = 'utf-8' @@ -38,17 +38,16 @@ def get_dictionary(self): class Location(YrObject): - def __init__(self, location_name, language_name='en'): + def __init__(self, location_name, language=Language()): self.location_name = location_name - self.language_name = language_name + self.language = language self.url = self.get_url() self.hash = self.get_hash() def get_url(self): - language = Language(self.language_name) url = 'http://www.yr.no/{place}/{location_name}/{forecast}.xml'.format( location_name = self.location_name, - **language.dictionary # **language.dictionary contain ~> place + forecast + **self.language.dictionary # **self.language.dictionary contain ~> place + forecast ) return url @@ -57,19 +56,15 @@ def get_hash(self): class Connect(YrObject): - extension = 'weatherdata.xml' - - def __init__(self, location_name, language_name='en'): - self.location_name = location_name - self.language_name = language_name + def __init__(self, location): + self.location = location def read(self): - location = Location(self.location_name, self.language_name) - cache = Cache(location, self.extension) + cache = Cache(self.location) if not cache.exists() or not cache.is_fresh(): - response = urllib.request.urlopen(location.url) + response = urllib.request.urlopen(self.location.url) if response.status != 200: - YrException('unavailable url ~> {url}'.format(url=location.url)) + YrException('unavailable url ~> {url}'.format(url=self.location.url)) weatherdata = response.read().decode(self.encoding) cache.dump(weatherdata) else: @@ -79,12 +74,14 @@ def read(self): class Cache(YrObject): directory = tempfile.gettempdir() + extension = 'weatherdata.xml' timeout = 30 # cache timeout in minutes - def __init__(self, location, what): + def __init__(self, location): + self.location = location self.filename = os.path.join( self.directory, - '{root}.{ext}'.format(root=location.hash, ext=what) # basename of filename + '{root}.{ext}'.format(root=self.location.hash, ext=self.extension) # basename of filename ) def dump(self, data): @@ -105,4 +102,4 @@ def load(self): return f.read() if __name__ == '__main__': - print(Connect('Czech_Republic/Prague/Prague').read()) + print(Connect(Location('Czech_Republic/Prague/Prague')).read()) From c35d6d0547944fe8ec0650b38009daed5571825c Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 3 Jun 2014 13:05:06 +0200 Subject: [PATCH 12/79] simplify yr/libyr.py --- yr/libyr.py | 52 ++++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/yr/libyr.py b/yr/libyr.py index 11055b9..23f060c 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -1,53 +1,42 @@ #!/usr/bin/env python3 -import sys, json -from yr.utils import Location, Connect, Cache, Language +import sys +import json +import xmltodict # <~ the only external dependency +from utils import Connect, Location, Language, YrException class Yr: def xmlsource(self): - data = Connect(self.location).read() - return data - - def xmltosoup(self, xml=None): - try: - from bs4 import BeautifulSoup - except ImportError: - sys.stderr.write('import error: from bs4 import BeautifulSoup\n') - sys.exit(1) - if xml is None: - return BeautifulSoup(self.xmlsource()) - else: - return BeautifulSoup(xml) + return self.connect.read() def xmltodict(self, xml=None): - try: - import xmltodict - except ImportError: - sys.stderr.write('import error: import xmltodict\n') - sys.exit(1) if xml is None: - return xmltodict.parse(self.xmlsource()) - else: - return xmltodict.parse(xml) + xml = self.xmlsource() + return xmltodict.parse(xml) + + def dicttoxml(self, dictionary): + return xmltodict.unparse(dictionary, pretty=True) def xmltojson(self, xml=None): + if xml is None: + xml = self.xmlsource() return json.dumps(self.xmltodict(xml), indent=4) - def now(self, as_json=False): # default is return result as dict ;) - soup = self.xmltosoup() - xml = str(soup.forecast.tabular.time) + def now(self, as_json=True): # default is return result as json ;) + xml = self.dicttoxml({'time': self.xmltodict()['weatherdata']['forecast']['tabular']['time'][0]}) if as_json: return self.xmltojson(xml) else: return self.xmltodict(xml) - def __init__(self, location_name, language='en'): + def __init__(self, location_name, language_name='en'): self.location_name = location_name - self.language = language - self._ = Language(self.language).get_dictionary() + self.language_name = language_name + self.language = Language(self.language_name) self.location = Location(self.location_name, self.language) + self.connect = Connect(self.location) self.yr_credit = { - 'text': self._['credit'], + 'text': self.language.dictionary['credit'], 'url': 'http://www.yr.no/' } @@ -168,3 +157,6 @@ def location_info(self): cache.write(json.dumps(location)) return location """ + +if __name__ == '__main__': + print(Yr('Czech_Republic/Prague/Prague').now()) From df95bd4b980db4fc9519abb7732c8764aad1a268 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 3 Jun 2014 13:34:13 +0200 Subject: [PATCH 13/79] simplify yr/examples/client.py --- yr/examples/client.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/yr/examples/client.py b/yr/examples/client.py index d3cd082..b278a64 100644 --- a/yr/examples/client.py +++ b/yr/examples/client.py @@ -1,11 +1,10 @@ #!/usr/bin/env python3 -import os.path, sys +import sys +import os.path parent_directory = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir)) sys.path.append(parent_directory) from libyr import Yr -#weather = Yr('Norge/Telemark/Skien/Skien') -weather = Yr('Czech_Republic/Prague/Prague') - -print(weather.now(as_json=True)) +weather = Yr('Norge/Telemark/Skien/Skien') +print(weather.now()) From 89698c8d9edca99d4da162a18e001e5916d0b488 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 3 Jun 2014 14:26:41 +0200 Subject: [PATCH 14/79] repair bugs before merge --- README.md | 2 +- setup.py | 2 +- yr/examples/client.py | 10 ++-- yr/libyr.py | 124 +----------------------------------------- 4 files changed, 9 insertions(+), 129 deletions(-) diff --git a/README.md b/README.md index 69c1781..443396d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ weather = Yr('Norge/Telemark/Skien/Skien') now_json = weather.now(as_json=True) # now = weather.now() # returns a dict -print now_json +print(now_json) ``` ### This returns diff --git a/setup.py b/setup.py index 05851dd..a3a84c5 100644 --- a/setup.py +++ b/setup.py @@ -17,5 +17,5 @@ ], packages=['yr'], package_data={'yr': ['languages/*.json']}, - install_requires=['requests', 'xmltodict', 'beautifulsoup4'], + install_requires=['xmltodict'], ) diff --git a/yr/examples/client.py b/yr/examples/client.py index b278a64..2266cd8 100644 --- a/yr/examples/client.py +++ b/yr/examples/client.py @@ -1,10 +1,8 @@ #!/usr/bin/env python3 -import sys -import os.path -parent_directory = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir)) -sys.path.append(parent_directory) -from libyr import Yr +from yr.libyr import Yr weather = Yr('Norge/Telemark/Skien/Skien') -print(weather.now()) +now_json = weather.now(as_json=True) + +print(now_json) diff --git a/yr/libyr.py b/yr/libyr.py index 23f060c..82d5d01 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -2,7 +2,7 @@ import sys import json import xmltodict # <~ the only external dependency -from utils import Connect, Location, Language, YrException +from yr.utils import Connect, Location, Language, YrException class Yr: @@ -22,7 +22,7 @@ def xmltojson(self, xml=None): xml = self.xmlsource() return json.dumps(self.xmltodict(xml), indent=4) - def now(self, as_json=True): # default is return result as json ;) + def now(self, as_json=False): # default is return result as dictionary ;) xml = self.dicttoxml({'time': self.xmltodict()['weatherdata']['forecast']['tabular']['time'][0]}) if as_json: return self.xmltojson(xml) @@ -40,123 +40,5 @@ def __init__(self, location_name, language_name='en'): 'url': 'http://www.yr.no/' } - """ - def temperature(self): - ''' - Get temperature from yr and return it. - ''' - getlocation = Location(self.location_name, self.language).find() - cache = Cache(getlocation, 'temperature') - if cache.exists() and cache.is_fresh(): - return json.loads(cache.read()) - data = Connect(getlocation).read() - data = et.fromstring(data) - out = {} - for parent in data[5].iter('temperature'): - if parent.attrib: - out['data'] = parent.attrib - out['credit'] = self.yr_credit - cache.write(json.dumps(out)) - return out - - def wind_speed(self): - ''' - Get wind speed from yr. - ''' - getlocation = Location(self.location_name, self.language).find() - cache = Cache(getlocation, 'windspeed') - if cache.exists() and cache.is_fresh(): - return json.loads(cache.read()) - data = Connect(getlocation).read() - data = et.fromstring(data) - out = {} - for parent in data[5].iter('windSpeed'): - if parent.attrib: - out['data'] = parent.attrib - out['credit'] = self.yr_credit - cache.write(json.dumps(out)) - return out - - def wind_direction(self): - ''' - Get wind direction from yr. - ''' - getlocation = Location(self.location_name, self.language).find() - cache = Cache(getlocation, 'wind_direction') - if cache.exists() and cache.is_fresh(): - return json.loads(cache.read()) - data = Connect(getlocation).read() - data = et.fromstring(data) - out = {} - for parent in data[5].iter('windDirection'): - if parent.attrib: - out['data'] = parent.attrib - out['credit'] = self.yr_credit - cache.write(json.dumps(out)) - return out - - def forecast(self): - getlocation = Location(self.location_name, self.language).find() - cache = Cache(getlocation, 'forecast') - if cache.exists() and cache.is_fresh(): - return json.loads(cache.read()) - data = Connect(getlocation).read() - data = et.fromstring(data) - days = [] - for parent in data[5][0].iter('text'): - for child in parent[0]: - days.append({ - 'from': child.get('from'), - 'to': child.get('to'), - child[0].tag: child[0].text, - child[1].tag: child[1].text, - }) - out = {} - out['data'] = days - out['credit'] = self.yr_credit - cache.write(json.dumps(out)) - return out - - def observations(self): - getlocation = Location(self.location_name, self.language).find() - cache = Cache(getlocation, 'observations') - if cache.exists() and cache.is_fresh(): - return json.loads(cache.read()) - data = Connect(getlocation).read() - data = et.fromstring(data) - observations = {} - observations['data'] = {} - for parent in data[6].iter('weatherstation'): - stno = parent.attrib['stno'] - observations['data'][stno] = parent.attrib - for child in parent: - tag = child.tag - observations['data'][stno][tag] = child.attrib - observations['credit'] = self.yr_credit - cache.write(json.dumps(observations)) - return observations - - def location_info(self): - getlocation = Location(self.location_name, self.language).find() - cache = Cache(getlocation, 'location') - if cache.exists() and cache.is_fresh(): - return json.loads(cache.read()) - data = Connect(getlocation).read() - data = et.fromstring(data) - location_list = [] - location = {} - for parent in data[0]: - if parent.attrib: - location_list.append(parent.attrib) - else: - location_list.append({ - parent.tag: parent.text - }) - location['data'] = location_list - location['credit'] = self.yr_credit - cache.write(json.dumps(location)) - return location - """ - if __name__ == '__main__': - print(Yr('Czech_Republic/Prague/Prague').now()) + print(Yr('Czech_Republic/Prague/Prague').now(as_json=True)) From b1afcad0b16a4a086396d2531134f0302aab8492 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 3 Jun 2014 21:16:49 +0200 Subject: [PATCH 15/79] add iterable forecast + examples --- yr/examples/client.py | 9 ++++++++- yr/libyr.py | 30 +++++++++++++++++------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/yr/examples/client.py b/yr/examples/client.py index 2266cd8..02c7188 100644 --- a/yr/examples/client.py +++ b/yr/examples/client.py @@ -3,6 +3,13 @@ from yr.libyr import Yr weather = Yr('Norge/Telemark/Skien/Skien') -now_json = weather.now(as_json=True) +now_json = weather.now(as_json=True) print(now_json) + +for forecast in weather.forecast(as_json=True): + print(forecast) + +print(weather.xml_source) +print(weather.dictionary) +print(weather.credit) diff --git a/yr/libyr.py b/yr/libyr.py index 82d5d01..1747c7e 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 + import sys import json import xmltodict # <~ the only external dependency @@ -6,36 +7,39 @@ class Yr: - def xmlsource(self): - return self.connect.read() + def xmltojson(self, xml): + return json.dumps(self.xmltodict(xml), indent=4) - def xmltodict(self, xml=None): - if xml is None: - xml = self.xmlsource() + def xmltodict(self, xml): return xmltodict.parse(xml) def dicttoxml(self, dictionary): return xmltodict.unparse(dictionary, pretty=True) - def xmltojson(self, xml=None): - if xml is None: - xml = self.xmlsource() - return json.dumps(self.xmltodict(xml), indent=4) - - def now(self, as_json=False): # default is return result as dictionary ;) - xml = self.dicttoxml({'time': self.xmltodict()['weatherdata']['forecast']['tabular']['time'][0]}) + def result(self, xml, as_json=False): # default is return result as dictionary ;) if as_json: return self.xmltojson(xml) else: return self.xmltodict(xml) + def forecast(self, as_json): + times = self.dictionary['weatherdata']['forecast']['tabular']['time'] + for time in times: + xml = self.dicttoxml({'time': time}) + yield self.result(xml, as_json) + + def now(self, as_json): + return next(self.forecast(as_json)) + def __init__(self, location_name, language_name='en'): self.location_name = location_name self.language_name = language_name self.language = Language(self.language_name) self.location = Location(self.location_name, self.language) self.connect = Connect(self.location) - self.yr_credit = { + self.xml_source = self.connect.read() + self.dictionary = self.xmltodict(self.xml_source) + self.credit = { 'text': self.language.dictionary['credit'], 'url': 'http://www.yr.no/' } From 629ac4d9a8ccb668c0015975d7e6bc4b8e8c649a Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 4 Jun 2014 07:54:48 +0200 Subject: [PATCH 16/79] remove redundant conversion --- yr/libyr.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/yr/libyr.py b/yr/libyr.py index 1747c7e..fdc4bf3 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -7,26 +7,25 @@ class Yr: - def xmltojson(self, xml): - return json.dumps(self.xmltodict(xml), indent=4) + def dict2json(self, dictionary): + return json.dumps(dictionary, indent=4) - def xmltodict(self, xml): + def xml2dict(self, xml): return xmltodict.parse(xml) - def dicttoxml(self, dictionary): + def dict2xml(self, dictionary): return xmltodict.unparse(dictionary, pretty=True) - def result(self, xml, as_json=False): # default is return result as dictionary ;) + def dict2result(self, dictionary, as_json=False): # default is return result as dictionary ;) if as_json: - return self.xmltojson(xml) + return self.dict2json(dictionary) else: - return self.xmltodict(xml) + return dictionary def forecast(self, as_json): times = self.dictionary['weatherdata']['forecast']['tabular']['time'] for time in times: - xml = self.dicttoxml({'time': time}) - yield self.result(xml, as_json) + yield self.dict2result({'time': time}, as_json) def now(self, as_json): return next(self.forecast(as_json)) @@ -38,7 +37,7 @@ def __init__(self, location_name, language_name='en'): self.location = Location(self.location_name, self.language) self.connect = Connect(self.location) self.xml_source = self.connect.read() - self.dictionary = self.xmltodict(self.xml_source) + self.dictionary = self.xml2dict(self.xml_source) self.credit = { 'text': self.language.dictionary['credit'], 'url': 'http://www.yr.no/' From c9123d667ae3542a0a640f1e43ba74d9c85efbf2 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 4 Jun 2014 12:23:26 +0200 Subject: [PATCH 17/79] hide verda.* files --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7f20b71..9f099fb 100644 --- a/.gitignore +++ b/.gitignore @@ -34,5 +34,4 @@ nosetests.xml .project .pydevproject -*.bak -verda.txt \ No newline at end of file +verda.* \ No newline at end of file From 576c15f4eaf6ae6677a698cea23ca25d09c912c4 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 4 Jun 2014 12:24:22 +0200 Subject: [PATCH 18/79] fix as_json bug --- yr/libyr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yr/libyr.py b/yr/libyr.py index fdc4bf3..ec4e9c4 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -22,12 +22,12 @@ def dict2result(self, dictionary, as_json=False): # default is return result as else: return dictionary - def forecast(self, as_json): + def forecast(self, as_json=False): times = self.dictionary['weatherdata']['forecast']['tabular']['time'] for time in times: yield self.dict2result({'time': time}, as_json) - def now(self, as_json): + def now(self, as_json=False): return next(self.forecast(as_json)) def __init__(self, location_name, language_name='en'): From c5549dd9813a88bf251ce8307b998559af76c4c2 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 4 Jun 2014 08:20:01 +0200 Subject: [PATCH 19/79] remove root (time) element from result (now) --- README.md | 61 ++++++++++++++++++++++++++--------------------------- yr/libyr.py | 12 +++++------ 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 443396d..613bd73 100644 --- a/README.md +++ b/README.md @@ -18,37 +18,36 @@ print(now_json) ### This returns ```json { - "time": { - "@from": "2014-02-08T21:00:00", - "@period": "3", - "@to": "2014-02-09T00:00:00", - "symbol": { - "@name": "Rain", - "@number": "9", - "@var": "09" - }, - "precipitation": { - "@maxvalue": "6.2", - "@minvalue": "3.0", - "@value": "4.6" - }, - "winddirection": { - "@code": "SSE", - "@deg": "148.4", - "@name": "South-southeast" - }, - "windspeed": { - "@mps": "6.6", - "@name": "Moderate breeze" - }, - "temperature": { - "@unit": "celsius", - "@value": "3" - }, - "pressure": { - "@unit": "hPa", - "@value": "983.0" - } + "@from": "2014-06-04T08:00:00", + "@to": "2014-06-04T12:00:00", + "@period": "1", + "symbol": { + "@number": "3", + "@numberEx": "3", + "@name": "Partly cloudy", + "@var": "03d" + }, + "precipitation": { + "@value": "0", + "@minvalue": "0", + "@maxvalue": "0.1" + }, + "windDirection": { + "@deg": "159.4", + "@code": "SSE", + "@name": "South-southeast" + }, + "windSpeed": { + "@mps": "1.3", + "@name": "Light air" + }, + "temperature": { + "@unit": "celsius", + "@value": "13" + }, + "pressure": { + "@unit": "hPa", + "@value": "1012.1" } } ``` diff --git a/yr/libyr.py b/yr/libyr.py index ec4e9c4..9b13e3a 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -7,8 +7,8 @@ class Yr: - def dict2json(self, dictionary): - return json.dumps(dictionary, indent=4) + def py2json(self, python): + return json.dumps(python, indent=4) def xml2dict(self, xml): return xmltodict.parse(xml) @@ -16,16 +16,16 @@ def xml2dict(self, xml): def dict2xml(self, dictionary): return xmltodict.unparse(dictionary, pretty=True) - def dict2result(self, dictionary, as_json=False): # default is return result as dictionary ;) + def py2result(self, python, as_json=False): # default is return result as dictionary ;) if as_json: - return self.dict2json(dictionary) + return self.py2json(python) else: - return dictionary + return python def forecast(self, as_json=False): times = self.dictionary['weatherdata']['forecast']['tabular']['time'] for time in times: - yield self.dict2result({'time': time}, as_json) + yield self.py2result(time, as_json) def now(self, as_json=False): return next(self.forecast(as_json)) From 1cb9e71c73df9a5854050c1418a031a88e3f6367 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 4 Jun 2014 13:00:37 +0200 Subject: [PATCH 20/79] how to get wind_speed ;) --- yr/examples/client.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/yr/examples/client.py b/yr/examples/client.py index 02c7188..2539787 100644 --- a/yr/examples/client.py +++ b/yr/examples/client.py @@ -4,12 +4,18 @@ weather = Yr('Norge/Telemark/Skien/Skien') -now_json = weather.now(as_json=True) -print(now_json) +#now_json = weather.now(as_json=True) +#print(now_json) +# +#for forecast in weather.forecast(as_json=True): +# print(forecast) +# +#print(weather.xml_source) +#print(weather.dictionary) +#print(weather.credit) -for forecast in weather.forecast(as_json=True): - print(forecast) +wind_speed = dict() +wind_speed['data'] = [{'from': forecast['@from'], 'to': forecast['@to'], 'speed': float(forecast['windSpeed']['@mps'])} for forecast in weather.forecast()] +wind_speed['credit'] = weather.credit -print(weather.xml_source) -print(weather.dictionary) -print(weather.credit) +print(wind_speed) From 558115b0898588f42ac37b5b45dc6120cc52bdfd Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 4 Jun 2014 15:55:07 +0200 Subject: [PATCH 21/79] add examples --- yr/examples/credit.py | 7 +++++++ yr/examples/dictionary.py | 7 +++++++ yr/examples/forecast.py | 8 ++++++++ yr/examples/forecast_json.py | 8 ++++++++ yr/examples/now.py | 8 ++++++++ yr/examples/now_json.py | 8 ++++++++ yr/examples/{client.py => wuurrd.py} | 10 ---------- yr/examples/xml_source.py | 7 +++++++ 8 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 yr/examples/credit.py create mode 100644 yr/examples/dictionary.py create mode 100644 yr/examples/forecast.py create mode 100644 yr/examples/forecast_json.py create mode 100644 yr/examples/now.py create mode 100644 yr/examples/now_json.py rename yr/examples/{client.py => wuurrd.py} (61%) create mode 100644 yr/examples/xml_source.py diff --git a/yr/examples/credit.py b/yr/examples/credit.py new file mode 100644 index 0000000..42796aa --- /dev/null +++ b/yr/examples/credit.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr('Norge/Telemark/Skien/Skien') + +print(weather.credit) diff --git a/yr/examples/dictionary.py b/yr/examples/dictionary.py new file mode 100644 index 0000000..cc569a7 --- /dev/null +++ b/yr/examples/dictionary.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr('Norge/Telemark/Skien/Skien') + +print(weather.dictionary) diff --git a/yr/examples/forecast.py b/yr/examples/forecast.py new file mode 100644 index 0000000..12c4a8b --- /dev/null +++ b/yr/examples/forecast.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr('Norge/Telemark/Skien/Skien') + +for forecast in weather.forecast(): + print(forecast) diff --git a/yr/examples/forecast_json.py b/yr/examples/forecast_json.py new file mode 100644 index 0000000..362a68e --- /dev/null +++ b/yr/examples/forecast_json.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr('Norge/Telemark/Skien/Skien') + +for forecast in weather.forecast(as_json=True): + print(forecast) diff --git a/yr/examples/now.py b/yr/examples/now.py new file mode 100644 index 0000000..e2b4e09 --- /dev/null +++ b/yr/examples/now.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr('Norge/Telemark/Skien/Skien') +now = weather.now() + +print(now) diff --git a/yr/examples/now_json.py b/yr/examples/now_json.py new file mode 100644 index 0000000..5a22e12 --- /dev/null +++ b/yr/examples/now_json.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr('Norge/Telemark/Skien/Skien') +now = weather.now(as_json=True) + +print(now) diff --git a/yr/examples/client.py b/yr/examples/wuurrd.py similarity index 61% rename from yr/examples/client.py rename to yr/examples/wuurrd.py index 2539787..daedf4e 100644 --- a/yr/examples/client.py +++ b/yr/examples/wuurrd.py @@ -4,16 +4,6 @@ weather = Yr('Norge/Telemark/Skien/Skien') -#now_json = weather.now(as_json=True) -#print(now_json) -# -#for forecast in weather.forecast(as_json=True): -# print(forecast) -# -#print(weather.xml_source) -#print(weather.dictionary) -#print(weather.credit) - wind_speed = dict() wind_speed['data'] = [{'from': forecast['@from'], 'to': forecast['@to'], 'speed': float(forecast['windSpeed']['@mps'])} for forecast in weather.forecast()] wind_speed['credit'] = weather.credit diff --git a/yr/examples/xml_source.py b/yr/examples/xml_source.py new file mode 100644 index 0000000..22efbeb --- /dev/null +++ b/yr/examples/xml_source.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr('Norge/Telemark/Skien/Skien') + +print(weather.xml_source) From b2d112f709e9501feade79bd496d15287d3bda2d Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 4 Jun 2014 15:57:41 +0200 Subject: [PATCH 22/79] fix non-ASCII url --- yr/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yr/utils.py b/yr/utils.py index f23e398..b79dd90 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -6,6 +6,7 @@ import tempfile # Cache import datetime # Cache import urllib.request # Connect +import urllib.parse # Location class YrObject: encoding = 'utf-8' @@ -46,7 +47,7 @@ def __init__(self, location_name, language=Language()): def get_url(self): url = 'http://www.yr.no/{place}/{location_name}/{forecast}.xml'.format( - location_name = self.location_name, + location_name = urllib.parse.quote(self.location_name), **self.language.dictionary # **self.language.dictionary contain ~> place + forecast ) return url From 0d68d2514aad748a580609911561d0f9bb6a207b Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Thu, 5 Jun 2014 12:26:45 +0200 Subject: [PATCH 23/79] fix non-existent location --- yr/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yr/utils.py b/yr/utils.py index b79dd90..8a83eec 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -63,7 +63,10 @@ def __init__(self, location): def read(self): cache = Cache(self.location) if not cache.exists() or not cache.is_fresh(): - response = urllib.request.urlopen(self.location.url) + try: + response = urllib.request.urlopen(self.location.url) + except: + YrException('unavailable url ~> {url}'.format(url=self.location.url)) if response.status != 200: YrException('unavailable url ~> {url}'.format(url=self.location.url)) weatherdata = response.read().decode(self.encoding) From da4924b6db4d48598304dd06fa7010accd1255fa Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Thu, 5 Jun 2014 15:43:33 +0200 Subject: [PATCH 24/79] modify README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 613bd73..0e5845c 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,12 @@ Pull requests are very welcomed! :-) from yr.libyr import Yr weather = Yr('Norge/Telemark/Skien/Skien') -now_json = weather.now(as_json=True) -# now = weather.now() # returns a dict +now = weather.now(as_json=True) -print(now_json) +print(now) ``` -### This returns +##### This returns ```json { "@from": "2014-06-04T08:00:00", @@ -52,4 +51,6 @@ print(now_json) } ``` +For more usage examples visit folder [examples](/yr/examples) or project [wiki](https://github.com/wckd/python-yr/wiki) + More to come! From a5c33cbc71cd1931ef25a01b6182c45c521ca277 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Fri, 6 Jun 2014 10:57:23 +0200 Subject: [PATCH 25/79] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..92b370f --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 473f359d116d7e9b174257546a701c3d34e617a4 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 9 Jul 2014 09:31:15 +0200 Subject: [PATCH 26/79] mod setup ~> 1.3.0-dev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a3a84c5..9d714c1 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='python-yr', - version='1.2.2-dev', + version='1.3.0-dev', description='Get the forecast from the norwegian wheather service yr.no in python', author='wckd @ github, idxxx23 @ github', author_email='alexander.l.hansen@gmail.com', From a378311981cd7216497c88bea916afe4ef216100 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 9 Jul 2014 14:15:33 +0200 Subject: [PATCH 27/79] mod setup ~> 1.3.0 --- setup.py | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 9d714c1..75b11c9 100644 --- a/setup.py +++ b/setup.py @@ -1,21 +1,36 @@ #!/usr/bin/env python3 -from distutils.core import setup +try: + from setuptools import setup +except ImportError: + from distutils.core import setup -setup(name='python-yr', - version='1.3.0-dev', - description='Get the forecast from the norwegian wheather service yr.no in python', - author='wckd @ github, idxxx23 @ github', - author_email='alexander.l.hansen@gmail.com', - url='https://github.com/wckd/python-yr', - classifiers=[ - 'Intended Audience :: Developers', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', - 'Operating System :: POSIX', - 'Programming Language :: Python', - 'Topic :: Internet', - ], - packages=['yr'], - package_data={'yr': ['languages/*.json']}, - install_requires=['xmltodict'], - ) +setup( + name = 'python-yr', + version = '1.3.0', + description = 'Get the forecast from the norwegian wheather service yr.no in python', + long_description = 'Get the forecast from the norwegian wheather service yr.no in python', + author = 'Alexander Hansen', + author_email = 'alexander.l.hansen@gmail.com', + maintainer = 'GNU Knight', + maintainer_email = 'idxxx23@gmail.com', + url = 'https://github.com/wckd/python-yr', + packages = ['yr'], + package_data = { + 'yr': [ + 'examples/*.py', + 'languages/*.json', + 'locations/*.gz', + ] + }, + classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'Operating System :: POSIX', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Topic :: Internet', + ], + install_requires = ['xmltodict'], # $$solve$$ ~> /usr/lib/python3.4/distutils/dist.py:260: UserWarning: Unknown distribution option: 'install_requires' warnings.warn(msg) +) From 93256e2a436f2e62ce6512020f1fcf5360a01160 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 9 Jul 2014 14:50:28 +0200 Subject: [PATCH 28/79] add examples/module_path.py ~> internal-use --- yr/examples/module_path.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 yr/examples/module_path.py diff --git a/yr/examples/module_path.py b/yr/examples/module_path.py new file mode 100644 index 0000000..cdd5f86 --- /dev/null +++ b/yr/examples/module_path.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 + +import yr.libyr +print('/home/pm/.local/lib/python3.4/site-packages/yr/libyr.py') # ~> is wrong! +print('/usr/local/lib/python3.4/dist-packages/yr/libyr.py') # ~> is ok! +print(yr.libyr.__file__) From 3a02f027fccfb8abb383190fb87987ce10369dfb Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Thu, 10 Jul 2014 08:36:34 +0200 Subject: [PATCH 29/79] add internal folder + mv module_path.py here --- yr/{examples => internal}/module_path.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yr/{examples => internal}/module_path.py (100%) diff --git a/yr/examples/module_path.py b/yr/internal/module_path.py similarity index 100% rename from yr/examples/module_path.py rename to yr/internal/module_path.py From 7ac5d36029136957fbba4c6079c9ce865ae2974c Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Wed, 9 Jul 2014 08:21:51 +0200 Subject: [PATCH 30/79] fix yr/utils.py ~> is_fresh --- yr/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yr/utils.py b/yr/utils.py index 8a83eec..deeefee 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -96,7 +96,7 @@ def is_fresh(self): mtime = datetime.datetime.fromtimestamp(os.path.getmtime(self.filename)) now = datetime.datetime.now() timeout = datetime.timedelta(minutes=self.timeout) - return mtime - now <= timeout + return now - mtime <= timeout # thanks for the fix antorweep def exists(self): return os.path.isfile(self.filename) From ea09575397d12646062ec75d5d949aebf29d0d93 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 8 Jul 2014 13:52:38 +0200 Subject: [PATCH 31/79] add location_name to examples --- yr/examples/credit.py | 2 +- yr/examples/dictionary.py | 2 +- yr/examples/forecast.py | 2 +- yr/examples/forecast_json.py | 2 +- yr/examples/now.py | 2 +- yr/examples/now_json.py | 2 +- yr/examples/wuurrd.py | 2 +- yr/examples/xml_source.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yr/examples/credit.py b/yr/examples/credit.py index 42796aa..9007e11 100644 --- a/yr/examples/credit.py +++ b/yr/examples/credit.py @@ -2,6 +2,6 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') print(weather.credit) diff --git a/yr/examples/dictionary.py b/yr/examples/dictionary.py index cc569a7..d9e0e2d 100644 --- a/yr/examples/dictionary.py +++ b/yr/examples/dictionary.py @@ -2,6 +2,6 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') print(weather.dictionary) diff --git a/yr/examples/forecast.py b/yr/examples/forecast.py index 12c4a8b..3db38c1 100644 --- a/yr/examples/forecast.py +++ b/yr/examples/forecast.py @@ -2,7 +2,7 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') for forecast in weather.forecast(): print(forecast) diff --git a/yr/examples/forecast_json.py b/yr/examples/forecast_json.py index 362a68e..1ff5d1a 100644 --- a/yr/examples/forecast_json.py +++ b/yr/examples/forecast_json.py @@ -2,7 +2,7 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') for forecast in weather.forecast(as_json=True): print(forecast) diff --git a/yr/examples/now.py b/yr/examples/now.py index e2b4e09..f50251a 100644 --- a/yr/examples/now.py +++ b/yr/examples/now.py @@ -2,7 +2,7 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') now = weather.now() print(now) diff --git a/yr/examples/now_json.py b/yr/examples/now_json.py index 5a22e12..e72cea4 100644 --- a/yr/examples/now_json.py +++ b/yr/examples/now_json.py @@ -2,7 +2,7 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') now = weather.now(as_json=True) print(now) diff --git a/yr/examples/wuurrd.py b/yr/examples/wuurrd.py index daedf4e..35f5dc6 100644 --- a/yr/examples/wuurrd.py +++ b/yr/examples/wuurrd.py @@ -2,7 +2,7 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') wind_speed = dict() wind_speed['data'] = [{'from': forecast['@from'], 'to': forecast['@to'], 'speed': float(forecast['windSpeed']['@mps'])} for forecast in weather.forecast()] diff --git a/yr/examples/xml_source.py b/yr/examples/xml_source.py index 22efbeb..ffbfaa3 100644 --- a/yr/examples/xml_source.py +++ b/yr/examples/xml_source.py @@ -2,6 +2,6 @@ from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') print(weather.xml_source) From 57b1f33f5300e801b980497efbe949d316a69dc1 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Thu, 10 Jul 2014 10:39:52 +0200 Subject: [PATCH 32/79] 1.3.1 --- README.md | 17 +++++++++++------ setup.py | 20 ++++++++++++++++++-- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0e5845c..aa5dc21 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,17 @@ python-yr ================= Library for the norwegian wheather service yr.no in python. -Pull requests are very welcomed! :-) - -### Usage +#### Usage ```python from yr.libyr import Yr -weather = Yr('Norge/Telemark/Skien/Skien') +weather = Yr(location_name='Norge/Telemark/Skien/Skien') now = weather.now(as_json=True) print(now) ``` -##### This returns +#### This returns ```json { "@from": "2014-06-04T08:00:00", @@ -53,4 +51,11 @@ print(now) For more usage examples visit folder [examples](/yr/examples) or project [wiki](https://github.com/wckd/python-yr/wiki) -More to come! +Pull requests are very welcomed! :-) + +#### Changelog + +1.3.1 (2014 Jul 10) + +* Bugfix: caching mechanism in 'is_fresh' function ~> thanks to antorweep +* Improve examples diff --git a/setup.py b/setup.py index 75b11c9..6c6528a 100644 --- a/setup.py +++ b/setup.py @@ -5,11 +5,27 @@ except ImportError: from distutils.core import setup +#try: +# from pypandoc import convert +# read_md = lambda filename: convert(filename, 'rst') +#except ImportError: +# print("warning: pypandoc module not found, could not convert Markdown to RST") +# read_md = lambda filename: open(filename, mode='r').read() +#long_description = read_md('README.md') + +#import pandoc +#pandoc.PANDOC_PATH = '/usr/bin/pandoc' +#doc = pandoc.Document() +#doc.markdown = open('README.md', mode='r').read() +#long_description = doc.rst + +long_description = open('README.md', mode='r').read() + setup( name = 'python-yr', - version = '1.3.0', + version = '1.3.1', description = 'Get the forecast from the norwegian wheather service yr.no in python', - long_description = 'Get the forecast from the norwegian wheather service yr.no in python', + long_description = long_description, author = 'Alexander Hansen', author_email = 'alexander.l.hansen@gmail.com', maintainer = 'GNU Knight', From 96a2a9aaf34c9993a7ed0630930878efd5d657c1 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Thu, 10 Jul 2014 12:33:42 +0200 Subject: [PATCH 33/79] 1.3.1.1 --- README.md | 4 +++ setup.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa5dc21..0cae800 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,10 @@ Pull requests are very welcomed! :-) #### Changelog +1.3.1.1 (2014 Jul 10) + +* Bugfix: pypi/pip installer in 'setup.py' + 1.3.1 (2014 Jul 10) * Bugfix: caching mechanism in 'is_fresh' function ~> thanks to antorweep diff --git a/setup.py b/setup.py index 6c6528a..18ea89e 100644 --- a/setup.py +++ b/setup.py @@ -19,11 +19,79 @@ #doc.markdown = open('README.md', mode='r').read() #long_description = doc.rst -long_description = open('README.md', mode='r').read() +#long_description = open('README.md', mode='r').read() + +long_description = '''\ +python-yr +================= +Library for the norwegian wheather service yr.no in python. + +#### Usage +```python +from yr.libyr import Yr + +weather = Yr(location_name='Norge/Telemark/Skien/Skien') +now = weather.now(as_json=True) + +print(now) +``` + +#### This returns +```json +{ + "@from": "2014-06-04T08:00:00", + "@to": "2014-06-04T12:00:00", + "@period": "1", + "symbol": { + "@number": "3", + "@numberEx": "3", + "@name": "Partly cloudy", + "@var": "03d" + }, + "precipitation": { + "@value": "0", + "@minvalue": "0", + "@maxvalue": "0.1" + }, + "windDirection": { + "@deg": "159.4", + "@code": "SSE", + "@name": "South-southeast" + }, + "windSpeed": { + "@mps": "1.3", + "@name": "Light air" + }, + "temperature": { + "@unit": "celsius", + "@value": "13" + }, + "pressure": { + "@unit": "hPa", + "@value": "1012.1" + } +} +``` + +For more usage examples visit folder [examples](/yr/examples) or project [wiki](https://github.com/wckd/python-yr/wiki) + +Pull requests are very welcomed! :-) + +#### Changelog + +1.3.1.1 (2014 Jul 10) + +* Bugfix: pypi/pip installer in 'setup.py' + +1.3.1 (2014 Jul 10) + +* Bugfix: caching mechanism in 'is_fresh' function ~> thanks to antorweep +* Improve examples +''' setup( name = 'python-yr', - version = '1.3.1', + version = '1.3.1.1', description = 'Get the forecast from the norwegian wheather service yr.no in python', long_description = long_description, author = 'Alexander Hansen', @@ -37,6 +105,7 @@ 'examples/*.py', 'languages/*.json', 'locations/*.gz', + 'README.md', ] }, classifiers = [ From 81acc82ba2ac5d320207616e08c1d8d4e321a72d Mon Sep 17 00:00:00 2001 From: Martin Bambas Date: Thu, 10 Jul 2014 13:44:00 +0200 Subject: [PATCH 34/79] Use regular exceptions. Conflicts: yr/libyr.py --- yr/utils.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index deeefee..28a8203 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -10,11 +10,8 @@ class YrObject: encoding = 'utf-8' -class YrException(YrObject): - - def __init__(self, error_message): - sys.stderr.write('python-yr: {error_message}\n'.format(error_message=error_message)) - sys.exit(1) +class YrException(Exception): + pass class Language(YrObject): @@ -35,7 +32,7 @@ def get_dictionary(self): with open(self.filename, mode='r', encoding=self.encoding) as f: return json.load(f) else: - YrException('unavailable language ~> {language_name}'.format(language_name=self.language_name)) + raise YrException('unavailable language ~> {language_name}'.format(language_name=self.language_name)) class Location(YrObject): @@ -66,9 +63,9 @@ def read(self): try: response = urllib.request.urlopen(self.location.url) except: - YrException('unavailable url ~> {url}'.format(url=self.location.url)) + raise YrException('unavailable url ~> {url}'.format(url=self.location.url)) if response.status != 200: - YrException('unavailable url ~> {url}'.format(url=self.location.url)) + raise YrException('unavailable url ~> {url}'.format(url=self.location.url)) weatherdata = response.read().decode(self.encoding) cache.dump(weatherdata) else: From 146ca5aa9f95c6a5dcafab3f2aa7fecfaa0e8b52 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Thu, 10 Jul 2014 16:28:59 +0200 Subject: [PATCH 35/79] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0cae800..a24185e 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ For more usage examples visit folder [examples](/yr/examples) or project [wiki]( Pull requests are very welcomed! :-) #### Changelog +1.3.1.2 (2014 Jul 10) +* Improved exception-handling, thanks @mbambas! 1.3.1.1 (2014 Jul 10) From 0186e6f8ae31c32bf11c5fcbc635df235752646c Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Fri, 11 Jul 2014 08:10:37 +0200 Subject: [PATCH 36/79] modify changelog in README.md and setup.py (1.3.2) --- README.md | 4 +++- setup.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a24185e..686dcfe 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,9 @@ For more usage examples visit folder [examples](/yr/examples) or project [wiki]( Pull requests are very welcomed! :-) #### Changelog -1.3.1.2 (2014 Jul 10) + +1.3.2 (2014 Jul 11) + * Improved exception-handling, thanks @mbambas! 1.3.1.1 (2014 Jul 10) diff --git a/setup.py b/setup.py index 18ea89e..9afd912 100644 --- a/setup.py +++ b/setup.py @@ -79,6 +79,10 @@ #### Changelog +1.3.2 (2014 Jul 11) + +* Improved exception-handling, thanks @mbambas! + 1.3.1.1 (2014 Jul 10) * Bugfix: pypi/pip installer in 'setup.py' From 7c341e111bc646c192b326350e1a10f59daff75f Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Fri, 11 Jul 2014 08:34:06 +0200 Subject: [PATCH 37/79] fix version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9afd912..6c7a147 100644 --- a/setup.py +++ b/setup.py @@ -95,7 +95,7 @@ setup( name = 'python-yr', - version = '1.3.1.1', + version = '1.3.2', description = 'Get the forecast from the norwegian wheather service yr.no in python', long_description = long_description, author = 'Alexander Hansen', From 0582a7e7e49534c7ec5273c8233af13163f7b362 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Fri, 11 Jul 2014 10:16:48 +0200 Subject: [PATCH 38/79] add MANIFEST.in ~> simplify setup.py --- MANIFEST.in | 1 + setup.py | 89 +---------------------------------------------------- 2 files changed, 2 insertions(+), 88 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..bb3ec5f --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include README.md diff --git a/setup.py b/setup.py index 6c7a147..6d6e2bf 100644 --- a/setup.py +++ b/setup.py @@ -5,93 +5,7 @@ except ImportError: from distutils.core import setup -#try: -# from pypandoc import convert -# read_md = lambda filename: convert(filename, 'rst') -#except ImportError: -# print("warning: pypandoc module not found, could not convert Markdown to RST") -# read_md = lambda filename: open(filename, mode='r').read() -#long_description = read_md('README.md') - -#import pandoc -#pandoc.PANDOC_PATH = '/usr/bin/pandoc' -#doc = pandoc.Document() -#doc.markdown = open('README.md', mode='r').read() -#long_description = doc.rst - -#long_description = open('README.md', mode='r').read() - -long_description = '''\ -python-yr -================= -Library for the norwegian wheather service yr.no in python. - -#### Usage -```python -from yr.libyr import Yr - -weather = Yr(location_name='Norge/Telemark/Skien/Skien') -now = weather.now(as_json=True) - -print(now) -``` - -#### This returns -```json -{ - "@from": "2014-06-04T08:00:00", - "@to": "2014-06-04T12:00:00", - "@period": "1", - "symbol": { - "@number": "3", - "@numberEx": "3", - "@name": "Partly cloudy", - "@var": "03d" - }, - "precipitation": { - "@value": "0", - "@minvalue": "0", - "@maxvalue": "0.1" - }, - "windDirection": { - "@deg": "159.4", - "@code": "SSE", - "@name": "South-southeast" - }, - "windSpeed": { - "@mps": "1.3", - "@name": "Light air" - }, - "temperature": { - "@unit": "celsius", - "@value": "13" - }, - "pressure": { - "@unit": "hPa", - "@value": "1012.1" - } -} -``` - -For more usage examples visit folder [examples](/yr/examples) or project [wiki](https://github.com/wckd/python-yr/wiki) - -Pull requests are very welcomed! :-) - -#### Changelog - -1.3.2 (2014 Jul 11) - -* Improved exception-handling, thanks @mbambas! - -1.3.1.1 (2014 Jul 10) - -* Bugfix: pypi/pip installer in 'setup.py' - -1.3.1 (2014 Jul 10) - -* Bugfix: caching mechanism in 'is_fresh' function ~> thanks to antorweep -* Improve examples -''' +long_description = open('README.md').read() setup( name = 'python-yr', @@ -109,7 +23,6 @@ 'examples/*.py', 'languages/*.json', 'locations/*.gz', - 'README.md', ] }, classifiers = [ From f3304cabe40be16451223de3ca9473909e1111b1 Mon Sep 17 00:00:00 2001 From: Luca Delucchi Date: Mon, 7 Jul 2014 11:46:00 +0200 Subject: [PATCH 39/79] add support for yr.no api service --- yr/examples/locationxzy.py | 11 +++++++++++ yr/libyr.py | 20 +++++++++++++++----- yr/utils.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 yr/examples/locationxzy.py diff --git a/yr/examples/locationxzy.py b/yr/examples/locationxzy.py new file mode 100644 index 0000000..adf56b6 --- /dev/null +++ b/yr/examples/locationxzy.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +#location for Italy/Trentino_and_South-Tirol/San_Michele_all'Adige + +san_michele = (46.19291, 11.13358, 210) +weather = Yr(xyz=san_michele) + +for forecast in weather.forecast(as_json=True): + print(forecast) diff --git a/yr/libyr.py b/yr/libyr.py index 9b13e3a..e1b8fe8 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -3,7 +3,7 @@ import sys import json import xmltodict # <~ the only external dependency -from yr.utils import Connect, Location, Language, YrException +from yr.utils import Connect, Location, LocationXYZ, Language, YrException class Yr: @@ -23,18 +23,28 @@ def py2result(self, python, as_json=False): # default is return result as dictio return python def forecast(self, as_json=False): - times = self.dictionary['weatherdata']['forecast']['tabular']['time'] + if self.xyz: + times = self.dictionary['weatherdata']['product']['time'] + else: + times = self.dictionary['weatherdata']['forecast']['tabular']['time'] for time in times: yield self.py2result(time, as_json) def now(self, as_json=False): return next(self.forecast(as_json)) - def __init__(self, location_name, language_name='en'): - self.location_name = location_name + def __init__(self, location_name=None, xyz=None, language_name='en'): self.language_name = language_name self.language = Language(self.language_name) - self.location = Location(self.location_name, self.language) + if location_name: + self.xyz = False + self.location_name = location_name + self.location = Location(self.location_name, self.language) + elif xyz: + self.xyz = True + self.location = LocationXYZ(xyz[0], xyz[1], xyz[2]) + else: + return YrException("location_name or xyz parameter ha to be set") self.connect = Connect(self.location) self.xml_source = self.connect.read() self.dictionary = self.xml2dict(self.xml_source) diff --git a/yr/utils.py b/yr/utils.py index 28a8203..70db16f 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -52,6 +52,35 @@ def get_url(self): def get_hash(self): return self.location_name.replace('/', '-') + +class LocationXYZ(YrObject): + """Class to use the API of yr.no""" + def __init__(self, x, y, z=0, language=Language()): + """ + + :param double x: longitude coordinate + :param double y: latitude coordinate + :param double z: altitude (meters above sea level) + :param language: a Language object + """ + self.x = x + self.y = y + self.z = z + self.language = language + self.url = self.get_url() + self.hash = self.get_hash() + + def get_url(self): + """Return the url of API service""" + url = "http://api.yr.no/weatherapi/locationforecast/1.9/?lat={y};" \ + "lon={x};msl={z}".format(x=self.x, y=self.y, z=self.z) + return url + + def get_hash(self): + """Create an hash with the three coordinates""" + return "location_{x}_{y}_{z}".format(x=self.x, y=self.y, z=self.z) + + class Connect(YrObject): def __init__(self, location): From 219dba8b7cb90a5728a9ffec468963da5ca78cfb Mon Sep 17 00:00:00 2001 From: Luca Delucchi Date: Tue, 8 Jul 2014 00:53:58 +0200 Subject: [PATCH 40/79] fix san michele location --- yr/examples/locationxzy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yr/examples/locationxzy.py b/yr/examples/locationxzy.py index adf56b6..a219d27 100644 --- a/yr/examples/locationxzy.py +++ b/yr/examples/locationxzy.py @@ -4,7 +4,7 @@ #location for Italy/Trentino_and_South-Tirol/San_Michele_all'Adige -san_michele = (46.19291, 11.13358, 210) +san_michele = (11.13358, 46.19291, 210) weather = Yr(xyz=san_michele) for forecast in weather.forecast(as_json=True): From 1241aa7632165a16dbfaa8c44678285aa903e1ce Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 8 Jul 2014 14:37:55 +0200 Subject: [PATCH 41/79] mod/merge lucadelu Conflicts: yr/libyr.py yr/utils.py --- yr/libyr.py | 17 +++++++++-------- yr/utils.py | 6 ++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/yr/libyr.py b/yr/libyr.py index e1b8fe8..375e757 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -23,7 +23,7 @@ def py2result(self, python, as_json=False): # default is return result as dictio return python def forecast(self, as_json=False): - if self.xyz: + if self.location_xyz: times = self.dictionary['weatherdata']['product']['time'] else: times = self.dictionary['weatherdata']['forecast']['tabular']['time'] @@ -33,18 +33,19 @@ def forecast(self, as_json=False): def now(self, as_json=False): return next(self.forecast(as_json)) - def __init__(self, location_name=None, xyz=None, language_name='en'): + def __init__(self, location_name=None, location_xyz=None, language_name='en'): self.language_name = language_name self.language = Language(self.language_name) if location_name: - self.xyz = False self.location_name = location_name + self.location_xyz = None self.location = Location(self.location_name, self.language) - elif xyz: - self.xyz = True - self.location = LocationXYZ(xyz[0], xyz[1], xyz[2]) + elif location_xyz: + self.location_name = None + self.location_xyz = location_xyz + self.location = LocationXYZ(location_xyz[0], location_xyz[1], location_xyz[2]) else: - return YrException("location_name or xyz parameter ha to be set") + return YrException("location_name or location_xyz parameter must be set") self.connect = Connect(self.location) self.xml_source = self.connect.read() self.dictionary = self.xml2dict(self.xml_source) @@ -54,4 +55,4 @@ def __init__(self, location_name=None, xyz=None, language_name='en'): } if __name__ == '__main__': - print(Yr('Czech_Republic/Prague/Prague').now(as_json=True)) + print(Yr(location_name='Czech_Republic/Prague/Prague').now(as_json=True)) diff --git a/yr/utils.py b/yr/utils.py index 70db16f..dbc3233 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -52,12 +52,11 @@ def get_url(self): def get_hash(self): return self.location_name.replace('/', '-') - class LocationXYZ(YrObject): """Class to use the API of yr.no""" + def __init__(self, x, y, z=0, language=Language()): """ - :param double x: longitude coordinate :param double y: latitude coordinate :param double z: altitude (meters above sea level) @@ -80,7 +79,6 @@ def get_hash(self): """Create an hash with the three coordinates""" return "location_{x}_{y}_{z}".format(x=self.x, y=self.y, z=self.z) - class Connect(YrObject): def __init__(self, location): @@ -132,4 +130,4 @@ def load(self): return f.read() if __name__ == '__main__': - print(Connect(Location('Czech_Republic/Prague/Prague')).read()) + print(Connect(Location(location_name='Czech_Republic/Prague/Prague')).read()) From 2d1054959284da48c66e7aba121c9168d005e1c2 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 8 Jul 2014 14:39:50 +0200 Subject: [PATCH 42/79] mod/merge lucadelu.examples Conflicts: yr/examples/forecast_csv.py --- yr/examples/forecast_xyz.py | 9 +++++++++ yr/examples/locationxzy.py | 11 ----------- 2 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 yr/examples/forecast_xyz.py delete mode 100644 yr/examples/locationxzy.py diff --git a/yr/examples/forecast_xyz.py b/yr/examples/forecast_xyz.py new file mode 100644 index 0000000..e0e1fd3 --- /dev/null +++ b/yr/examples/forecast_xyz.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +#weather = Yr(location_name="Italy/Trentino_and_South-Tirol/San_Michele_all'Adige") +weather = Yr(location_xyz=(11.13358, 46.19291, 210)) # xyz for Italy/Trentino_and_South-Tirol/San_Michele_all'Adige + +for forecast in weather.forecast(as_json=True): + print(forecast) diff --git a/yr/examples/locationxzy.py b/yr/examples/locationxzy.py deleted file mode 100644 index a219d27..0000000 --- a/yr/examples/locationxzy.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python3 - -from yr.libyr import Yr - -#location for Italy/Trentino_and_South-Tirol/San_Michele_all'Adige - -san_michele = (11.13358, 46.19291, 210) -weather = Yr(xyz=san_michele) - -for forecast in weather.forecast(as_json=True): - print(forecast) From b0ec553bd708f7adc7bc10d3790c418682cbe9c0 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 8 Jul 2014 14:53:46 +0200 Subject: [PATCH 43/79] mod yr/libyr.py ~> split line From 768884331a59834d4ddb76fdf00a33b1c2f4b0ae Mon Sep 17 00:00:00 2001 From: Antorweep Chakravorty Date: Tue, 8 Jul 2014 10:28:02 +0200 Subject: [PATCH 44/79] Hourly Forecast Mod. for different forecast links Example for hour_by_hour_forecast Bug Fix: Utils.Cache.is_fresh --- yr/examples/forecast_hour_by_hour.py | 8 ++++++++ yr/examples/forecast_hour_by_hour_json.py | 8 ++++++++ yr/libyr.py | 5 +++-- yr/utils.py | 8 +++++--- 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 yr/examples/forecast_hour_by_hour.py create mode 100644 yr/examples/forecast_hour_by_hour_json.py diff --git a/yr/examples/forecast_hour_by_hour.py b/yr/examples/forecast_hour_by_hour.py new file mode 100644 index 0000000..97dccbd --- /dev/null +++ b/yr/examples/forecast_hour_by_hour.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr(location_name='Norway/Rogaland/Stavanger/Stavanger', forecast_link='forecast_hour_by_hour') + +for forecast in weather.forecast(): + print(forecast) diff --git a/yr/examples/forecast_hour_by_hour_json.py b/yr/examples/forecast_hour_by_hour_json.py new file mode 100644 index 0000000..890483e --- /dev/null +++ b/yr/examples/forecast_hour_by_hour_json.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 + +from yr.libyr import Yr + +weather = Yr(location_name='Norway/Rogaland/Stavanger/Stavanger', forecast_link='forecast_hour_by_hour') + +for forecast in weather.forecast(as_json=True): + print(forecast) diff --git a/yr/libyr.py b/yr/libyr.py index 375e757..24c7a30 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -33,13 +33,14 @@ def forecast(self, as_json=False): def now(self, as_json=False): return next(self.forecast(as_json)) - def __init__(self, location_name=None, location_xyz=None, language_name='en'): + def __init__(self, location_name=None, location_xyz=None, forecast_link='forecast', language_name='en'): self.language_name = language_name + self.forecast_link = forecast_link self.language = Language(self.language_name) if location_name: self.location_name = location_name self.location_xyz = None - self.location = Location(self.location_name, self.language) + self.location = Location(self.location_name, self.forecast_link, self.language) elif location_xyz: self.location_name = None self.location_xyz = location_xyz diff --git a/yr/utils.py b/yr/utils.py index dbc3233..8a8eaef 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -36,16 +36,18 @@ def get_dictionary(self): class Location(YrObject): - def __init__(self, location_name, language=Language()): + def __init__(self, location_name, forecast_link='forecast', language=Language()): self.location_name = location_name + self.forecast_link = forecast_link self.language = language self.url = self.get_url() self.hash = self.get_hash() def get_url(self): - url = 'http://www.yr.no/{place}/{location_name}/{forecast}.xml'.format( + url = 'http://www.yr.no/{place}/{location_name}/{forecast_link}.xml'.format( location_name = urllib.parse.quote(self.location_name), - **self.language.dictionary # **self.language.dictionary contain ~> place + forecast + forecast_link = urllib.parse.quote(self.forecast_link), + **self.language.dictionary # **self.language.dictionary contain ~> place + forecast_link ) return url From 10bbd36d9265b02b7c4a23830d52ccc680362848 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Fri, 12 Sep 2014 09:45:59 +0200 Subject: [PATCH 45/79] prepare to merge --- .gitignore | 2 -- yr/libyr.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9f099fb..d2d6f36 100644 --- a/.gitignore +++ b/.gitignore @@ -33,5 +33,3 @@ nosetests.xml .mr.developer.cfg .project .pydevproject - -verda.* \ No newline at end of file diff --git a/yr/libyr.py b/yr/libyr.py index 24c7a30..9ec403b 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -46,7 +46,7 @@ def __init__(self, location_name=None, location_xyz=None, forecast_link='forecas self.location_xyz = location_xyz self.location = LocationXYZ(location_xyz[0], location_xyz[1], location_xyz[2]) else: - return YrException("location_name or location_xyz parameter must be set") + raise YrException("location_name or location_xyz parameter must be set") self.connect = Connect(self.location) self.xml_source = self.connect.read() self.dictionary = self.xml2dict(self.xml_source) From d9d1a751734a55e37bc1b361f74428a7aac22bb0 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Fri, 12 Sep 2014 10:30:54 +0200 Subject: [PATCH 46/79] 1.4.0 --- README.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 686dcfe..07f86a1 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,11 @@ Pull requests are very welcomed! :-) #### Changelog +1.4.0 (2014 Sep 12) + +* Add support for yr.no api service ~> thanks to lucadelu +* Add hourly forecast ~> thanks to antorweep1987 + 1.3.2 (2014 Jul 11) * Improved exception-handling, thanks @mbambas! diff --git a/setup.py b/setup.py index 6d6e2bf..ed221fe 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name = 'python-yr', - version = '1.3.2', + version = '1.4.0', description = 'Get the forecast from the norwegian wheather service yr.no in python', long_description = long_description, author = 'Alexander Hansen', From e9ae9c4fab4926bef55ab185ffb55910bf87ff05 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Fri, 10 Oct 2014 15:09:59 +0200 Subject: [PATCH 47/79] add forecast_hour_by_hour to languages --- yr/languages/en.json | 1 + yr/languages/nb.json | 1 + yr/languages/nn.json | 1 + 3 files changed, 3 insertions(+) diff --git a/yr/languages/en.json b/yr/languages/en.json index 9a10ee0..b379938 100644 --- a/yr/languages/en.json +++ b/yr/languages/en.json @@ -2,5 +2,6 @@ "language": "en", "place": "place", "forecast": "forecast", + "forecast_hour_by_hour": "forecast_hour_by_hour", "credit": "Weather forecast from yr.no, delivered by the Norwegian Meteorological Institute and the NRK" } diff --git a/yr/languages/nb.json b/yr/languages/nb.json index 8f725d4..1ca2010 100644 --- a/yr/languages/nb.json +++ b/yr/languages/nb.json @@ -2,5 +2,6 @@ "language": "nb", "place": "sted", "forecast": "varsel", + "forecast_hour_by_hour": "varsel_time_for_time", "credit": "Værvarsel fra yr.no, levert av Meteorologisk institutt og NRK" } diff --git a/yr/languages/nn.json b/yr/languages/nn.json index 6e6a0b1..35ca7f2 100644 --- a/yr/languages/nn.json +++ b/yr/languages/nn.json @@ -2,5 +2,6 @@ "language": "nn", "place": "stad", "forecast": "varsel", + "forecast_hour_by_hour": "varsel_time_for_time", "credit": "Vêrvarsel frå yr.no, levert av Meteorologisk institutt og NRK" } From e0bb877ab36c47211d9a07387e2731f67385b9b1 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Fri, 10 Oct 2014 15:10:30 +0200 Subject: [PATCH 48/79] rewrite yr/utils.py * add logging support * mod some variables * mod catching exceptions * rewrite LocationXYZ functionality to API_Locationforecast * swap longitude and latitude * add self.coordinates * add self.location_name ~> not ideal, so it will probably change in future * add LocationXYZ wrapper over API_Locationforecast for backward compatibility * mod hash names for temporary files --- yr/utils.py | 169 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 124 insertions(+), 45 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 8a8eaef..978d556 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 +import logging import sys import os.path import json # Language @@ -8,78 +9,121 @@ import urllib.request # Connect import urllib.parse # Location -class YrObject: encoding = 'utf-8' +class YrObject: + + script_directory = os.path.dirname(os.path.abspath(__file__)) # directory of the script + encoding = 'utf-8' class YrException(Exception): - pass + + def __init__(self, message): + logging.error(message) + raise class Language(YrObject): - script_directory = os.path.dirname(os.path.abspath(__file__)) # directory of the script directory = 'languages' + default_language_name = 'en' + extension = 'json' - def __init__(self, language_name='en'): + def __init__(self, language_name=default_language_name): self.language_name = language_name self.filename = os.path.join( self.script_directory, self.directory, - '{root}.{ext}'.format(root=self.language_name, ext='json') # basename of filename + '{language_name}.{extension}'.format( + language_name = self.language_name, + extension = self.extension, + ), # basename of filename ) self.dictionary = self.get_dictionary() def get_dictionary(self): - if os.path.exists(self.filename): + try: + logging.info('read language dictionary: {}'.format(self.filename)) with open(self.filename, mode='r', encoding=self.encoding) as f: return json.load(f) - else: - raise YrException('unavailable language ~> {language_name}'.format(language_name=self.language_name)) + except Exception as e: + raise YrException(e) class Location(YrObject): - def __init__(self, location_name, forecast_link='forecast', language=Language()): + base_url = 'http://www.yr.no/' + default_forecast_link = 'forecast' + forecast_links = [default_forecast_link, 'forecast_hour_by_hour'] + extension = 'xml' + + def __init__(self, location_name, forecast_link=default_forecast_link, language=False): self.location_name = location_name - self.forecast_link = forecast_link - self.language = language + self.language = language if isinstance(language, Language) else Language() + + if forecast_link in self.forecast_links: # must be valid forecast_link + self.forecast_link = self.language.dictionary[forecast_link] + else: + self.forecast_link = self.default_forecast_link + self.url = self.get_url() self.hash = self.get_hash() def get_url(self): - url = 'http://www.yr.no/{place}/{location_name}/{forecast_link}.xml'.format( + return '{base_url}{place}/{location_name}/{forecast_link}.{extension}'.format( + base_url = self.base_url, + place = self.language.dictionary['place'], location_name = urllib.parse.quote(self.location_name), - forecast_link = urllib.parse.quote(self.forecast_link), - **self.language.dictionary # **self.language.dictionary contain ~> place + forecast_link + forecast_link = self.forecast_link, + extension = self.extension, ) - return url def get_hash(self): - return self.location_name.replace('/', '-') + return '{location_name}.{forecast_link}'.format( + location_name=self.location_name.replace('/', '-'), + forecast_link=self.forecast_link, + ) -class LocationXYZ(YrObject): +class API_Locationforecast(YrObject): """Class to use the API of yr.no""" - def __init__(self, x, y, z=0, language=Language()): + base_url = 'http://api.yr.no/weatherapi/locationforecast/1.9/?' + forecast_link = 'locationforecast' + + def __init__(self, lat, lon, msl=0, language=False): """ - :param double x: longitude coordinate - :param double y: latitude coordinate - :param double z: altitude (meters above sea level) + :param double lat: latitude coordinate + :param double lon: longitude coordinate + :param double msl: altitude (meters above sea level) :param language: a Language object """ - self.x = x - self.y = y - self.z = z - self.language = language + self.coordinates = dict(lat=lat, lon=lon, msl=msl) + self.location_name = 'lat={lat};lon={lon};msl={msl}'.format(**self.coordinates) + #self.language = language if isinstance(language, Language) else Language() self.url = self.get_url() self.hash = self.get_hash() def get_url(self): """Return the url of API service""" - url = "http://api.yr.no/weatherapi/locationforecast/1.9/?lat={y};" \ - "lon={x};msl={z}".format(x=self.x, y=self.y, z=self.z) - return url + return '{base_url}{location_name}'.format( + base_url=self.base_url, + location_name=self.location_name, + ) def get_hash(self): """Create an hash with the three coordinates""" - return "location_{x}_{y}_{z}".format(x=self.x, y=self.y, z=self.z) + return '{location_name}.{forecast_link}'.format( + location_name=self.location_name, + forecast_link=self.forecast_link, + ) + +class LocationXYZ(API_Locationforecast): # ~> Deprecated!!! + """Class to use the API of yr.no""" + + def __init__(self, x, y, z=0, language=False): + """ + :param double x: longitude coordinate + :param double y: latitude coordinate + :param double z: altitude (meters above sea level) + :param language: a Language object + """ + super().__init__(y, x, z, language) class Connect(YrObject): @@ -87,34 +131,43 @@ def __init__(self, location): self.location = location def read(self): - cache = Cache(self.location) - if not cache.exists() or not cache.is_fresh(): - try: + try: + logging.info('weatherdata request: {}, forecast-link: {}'.format( + self.location.location_name, + self.location.forecast_link, + )) + cache = Cache(self.location) + if not cache.exists() or not cache.is_fresh(): + logging.info('read online: {}'.format(self.location.url)) response = urllib.request.urlopen(self.location.url) - except: - raise YrException('unavailable url ~> {url}'.format(url=self.location.url)) - if response.status != 200: - raise YrException('unavailable url ~> {url}'.format(url=self.location.url)) - weatherdata = response.read().decode(self.encoding) - cache.dump(weatherdata) - else: - weatherdata = cache.load() - return weatherdata + if response.status != 200: + raise + weatherdata = response.read().decode(self.encoding) + cache.dump(weatherdata) + else: + weatherdata = cache.load() + return weatherdata + except Exception as e: + raise YrException(e) class Cache(YrObject): directory = tempfile.gettempdir() - extension = 'weatherdata.xml' - timeout = 30 # cache timeout in minutes + extension = 'xml' + timeout = 15 # cache timeout in minutes def __init__(self, location): self.location = location self.filename = os.path.join( self.directory, - '{root}.{ext}'.format(root=self.location.hash, ext=self.extension) # basename of filename + '{location_hash}.{extension}'.format( + location_hash=self.location.hash, + extension=self.extension, + ), # basename of filename ) def dump(self, data): + logging.info('write caching: {}'.format(self.filename)) with open(self.filename, mode='w', encoding=self.encoding) as f: f.write(data) @@ -128,8 +181,34 @@ def exists(self): return os.path.isfile(self.filename) def load(self): + logging.info('read from cache: {}'.format(self.filename)) with open(self.filename, mode='r', encoding=self.encoding) as f: return f.read() if __name__ == '__main__': - print(Connect(Location(location_name='Czech_Republic/Prague/Prague')).read()) + logging.basicConfig(level=logging.DEBUG) + logging.info('starting __main__') + + weatherdata = Connect(Location( + location_name='Czech_Republic/Prague/Prague', + forecast_link='forecast', + language=Language(language_name='en'), + )).read() + #print(weatherdata) + + weatherdata = Connect(Location( + location_name='Czech_Republic/Prague/Prague', + forecast_link='forecast_hour_by_hour', + language=Language(language_name='en'), + )).read() + #print(weatherdata) + + weatherdata = Connect(API_Locationforecast( + 50.0596696, + 14.4656239, + 11, + language=Language(language_name='en'), + )).read() + #print(weatherdata) + + logging.info('stopping __main__') From a18ba61da232890fb02ea5bae598996077e339b7 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Mon, 13 Oct 2014 15:25:54 +0200 Subject: [PATCH 49/79] add url to languages --- yr/languages/en.json | 3 ++- yr/languages/nb.json | 3 ++- yr/languages/nn.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/yr/languages/en.json b/yr/languages/en.json index b379938..01ad91d 100644 --- a/yr/languages/en.json +++ b/yr/languages/en.json @@ -3,5 +3,6 @@ "place": "place", "forecast": "forecast", "forecast_hour_by_hour": "forecast_hour_by_hour", - "credit": "Weather forecast from yr.no, delivered by the Norwegian Meteorological Institute and the NRK" + "credit": "Weather forecast from yr.no, delivered by the Norwegian Meteorological Institute and the NRK", + "url": "http://www.yr.no/" } diff --git a/yr/languages/nb.json b/yr/languages/nb.json index 1ca2010..a4d62d2 100644 --- a/yr/languages/nb.json +++ b/yr/languages/nb.json @@ -3,5 +3,6 @@ "place": "sted", "forecast": "varsel", "forecast_hour_by_hour": "varsel_time_for_time", - "credit": "Værvarsel fra yr.no, levert av Meteorologisk institutt og NRK" + "credit": "Værvarsel fra yr.no, levert av Meteorologisk institutt og NRK", + "url": "http://www.yr.no/" } diff --git a/yr/languages/nn.json b/yr/languages/nn.json index 35ca7f2..e55b6f5 100644 --- a/yr/languages/nn.json +++ b/yr/languages/nn.json @@ -3,5 +3,6 @@ "place": "stad", "forecast": "varsel", "forecast_hour_by_hour": "varsel_time_for_time", - "credit": "Vêrvarsel frå yr.no, levert av Meteorologisk institutt og NRK" + "credit": "Vêrvarsel frå yr.no, levert av Meteorologisk institutt og NRK", + "url": "http://www.yr.no/" } From 2a0f2c1dd04a3934a76244c193a6b0e441b1ddd6 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Mon, 13 Oct 2014 15:39:13 +0200 Subject: [PATCH 50/79] mod credit in languages --- yr/languages/en.json | 7 +++++-- yr/languages/nb.json | 7 +++++-- yr/languages/nn.json | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/yr/languages/en.json b/yr/languages/en.json index 01ad91d..00280e5 100644 --- a/yr/languages/en.json +++ b/yr/languages/en.json @@ -3,6 +3,9 @@ "place": "place", "forecast": "forecast", "forecast_hour_by_hour": "forecast_hour_by_hour", - "credit": "Weather forecast from yr.no, delivered by the Norwegian Meteorological Institute and the NRK", - "url": "http://www.yr.no/" + "credit": + { + "text": "Weather forecast from yr.no, delivered by the Norwegian Meteorological Institute and the NRK", + "url": "http://www.yr.no/" + } } diff --git a/yr/languages/nb.json b/yr/languages/nb.json index a4d62d2..4f4b44b 100644 --- a/yr/languages/nb.json +++ b/yr/languages/nb.json @@ -3,6 +3,9 @@ "place": "sted", "forecast": "varsel", "forecast_hour_by_hour": "varsel_time_for_time", - "credit": "Værvarsel fra yr.no, levert av Meteorologisk institutt og NRK", - "url": "http://www.yr.no/" + "credit": + { + "text": "Værvarsel fra yr.no, levert av Meteorologisk institutt og NRK", + "url": "http://www.yr.no/" + } } diff --git a/yr/languages/nn.json b/yr/languages/nn.json index e55b6f5..f259b3e 100644 --- a/yr/languages/nn.json +++ b/yr/languages/nn.json @@ -3,6 +3,9 @@ "place": "stad", "forecast": "varsel", "forecast_hour_by_hour": "varsel_time_for_time", - "credit": "Vêrvarsel frå yr.no, levert av Meteorologisk institutt og NRK", - "url": "http://www.yr.no/" + "credit": + { + "text": "Vêrvarsel frå yr.no, levert av Meteorologisk institutt og NRK", + "url": "http://www.yr.no/" + } } From 6320fa60cb322fa169c0a3429b098ff71c17fa58 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Mon, 13 Oct 2014 15:42:07 +0200 Subject: [PATCH 51/79] rewrite yr/libqr.py * add logging support * mod some variables * rewrite LocationXYZ functionality to API_Locationforecast --- yr/libyr.py | 86 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 17 deletions(-) diff --git a/yr/libyr.py b/yr/libyr.py index 9ec403b..137dd0a 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -1,12 +1,16 @@ #!/usr/bin/env python3 +import logging import sys import json import xmltodict # <~ the only external dependency -from yr.utils import Connect, Location, LocationXYZ, Language, YrException +from yr.utils import Connect, Location, API_Locationforecast, Language, YrException class Yr: + default_forecast_link = 'forecast' + default_language_name = 'en' + def py2json(self, python): return json.dumps(python, indent=4) @@ -23,7 +27,7 @@ def py2result(self, python, as_json=False): # default is return result as dictio return python def forecast(self, as_json=False): - if self.location_xyz: + if self.coordinates: times = self.dictionary['weatherdata']['product']['time'] else: times = self.dictionary['weatherdata']['forecast']['tabular']['time'] @@ -33,27 +37,75 @@ def forecast(self, as_json=False): def now(self, as_json=False): return next(self.forecast(as_json)) - def __init__(self, location_name=None, location_xyz=None, forecast_link='forecast', language_name='en'): - self.language_name = language_name + def __init__( + self, + location_name=None, + coordinates=None, + location_xyz=None, + forecast_link=default_forecast_link, + language_name=default_language_name, + ): self.forecast_link = forecast_link - self.language = Language(self.language_name) + self.language_name = language_name + self.language = Language(language_name=self.language_name) + + if location_xyz: + coordinates = (location_xyz[1], location_xyz[0], location_xyz[2]) + self.location_xyz = location_xyz + if location_name: self.location_name = location_name - self.location_xyz = None - self.location = Location(self.location_name, self.forecast_link, self.language) - elif location_xyz: + self.coordinates = None + self.location = Location( + location_name=self.location_name, + forecast_link=self.forecast_link, + language=self.language, + ) + elif coordinates: self.location_name = None - self.location_xyz = location_xyz - self.location = LocationXYZ(location_xyz[0], location_xyz[1], location_xyz[2]) + self.coordinates = coordinates + self.location = API_Locationforecast( + lat=self.coordinates[0], + lon=self.coordinates[1], + msl=self.coordinates[2], + language=self.language, + ) else: - raise YrException("location_name or location_xyz parameter must be set") - self.connect = Connect(self.location) + raise YrException('location_name or location_xyz parameter must be set') + + self.connect = Connect(location=self.location) self.xml_source = self.connect.read() self.dictionary = self.xml2dict(self.xml_source) - self.credit = { - 'text': self.language.dictionary['credit'], - 'url': 'http://www.yr.no/' - } + self.credit = self.language.dictionary['credit'] if __name__ == '__main__': - print(Yr(location_name='Czech_Republic/Prague/Prague').now(as_json=True)) + logging.basicConfig(level=logging.DEBUG) + logging.info('starting __main__') + + weatherdata = Yr( + location_name='Czech_Republic/Prague/Prague', + forecast_link='forecast', + language_name='en', + ).now(as_json=True) + #print(weatherdata) + + weatherdata = Yr( + location_name='Czech_Republic/Prague/Prague', + forecast_link='forecast_hour_by_hour', + language_name='en', + ).now(as_json=True) + #print(weatherdata) + + weatherdata = Yr( + location_xyz=(14.4656239,50.0596696,11), + language_name='en', + ).now(as_json=True) + #print(weatherdata) + + weatherdata = Yr( + coordinates=(50.0596696,14.4656239,11), + language_name='en', + ).now(as_json=True) + #print(weatherdata) + + logging.info('stopping __main__') From 432f1e7ab36c709362bc0d743feaa9e36f2be132 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Thu, 11 Dec 2014 10:17:47 +0100 Subject: [PATCH 52/79] mod setup + readme --- CHANGES.rst | 38 ++++++++++++++++++++++ LICENSE => COPYING.txt | 2 +- MANIFEST.in | 6 +++- README.md | 74 ------------------------------------------ README.rst | 65 +++++++++++++++++++++++++++++++++++++ setup.py | 23 ++++--------- 6 files changed, 116 insertions(+), 92 deletions(-) create mode 100644 CHANGES.rst rename LICENSE => COPYING.txt (99%) delete mode 100644 README.md create mode 100755 README.rst diff --git a/CHANGES.rst b/CHANGES.rst new file mode 100644 index 0000000..102206f --- /dev/null +++ b/CHANGES.rst @@ -0,0 +1,38 @@ +Changelog +========= + +1.4.1 (2014 Dec 11) + +* add logging support +* mod some variables +* mod catching exceptions +* rewrite LocationXYZ functionality to API_Locationforecast + * swap longitude and latitude + * add self.coordinates + * add self.location_name ~> not ideal, so it will probably change in future +* add LocationXYZ wrapper over API_Locationforecast for backward compatibility +* mod hash names for temporary files +* improve setup.py +* mod README from Markdown to reStructuredText + +1.4.0 (2014 Sep 12) + +* add support for yr.no api service ~> thanks to lucadelu_ +* add hourly forecast ~> thanks to antorweep1987_ + +1.3.2 (2014 Jul 11) + +* improve exception-handling ~> thanks to mbambas_ + +1.3.1.1 (2014 Jul 10) + +* bugfix: pypi/pip installer in 'setup.py' + +1.3.1 (2014 Jul 10) + +* bugfix: caching mechanism in 'is_fresh' function ~> thanks to antorweep1987_ +* improve examples + +.. _antorweep1987: https://github.com/antorweep1987 +.. _mbambas: https://github.com/mbambas +.. _lucadelu: https://github.com/lucadelu diff --git a/LICENSE b/COPYING.txt similarity index 99% rename from LICENSE rename to COPYING.txt index 92b370f..94a9ed0 100644 --- a/LICENSE +++ b/COPYING.txt @@ -1,4 +1,4 @@ -GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. diff --git a/MANIFEST.in b/MANIFEST.in index bb3ec5f..c186ac6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,5 @@ -include README.md +include COPYING.txt +include README.rst +include CHANGES.rst +recursive-include yr/languages * +recursive-include yr/examples * diff --git a/README.md b/README.md deleted file mode 100644 index 07f86a1..0000000 --- a/README.md +++ /dev/null @@ -1,74 +0,0 @@ -python-yr -================= -Library for the norwegian wheather service yr.no in python. - -#### Usage -```python -from yr.libyr import Yr - -weather = Yr(location_name='Norge/Telemark/Skien/Skien') -now = weather.now(as_json=True) - -print(now) -``` - -#### This returns -```json -{ - "@from": "2014-06-04T08:00:00", - "@to": "2014-06-04T12:00:00", - "@period": "1", - "symbol": { - "@number": "3", - "@numberEx": "3", - "@name": "Partly cloudy", - "@var": "03d" - }, - "precipitation": { - "@value": "0", - "@minvalue": "0", - "@maxvalue": "0.1" - }, - "windDirection": { - "@deg": "159.4", - "@code": "SSE", - "@name": "South-southeast" - }, - "windSpeed": { - "@mps": "1.3", - "@name": "Light air" - }, - "temperature": { - "@unit": "celsius", - "@value": "13" - }, - "pressure": { - "@unit": "hPa", - "@value": "1012.1" - } -} -``` - -For more usage examples visit folder [examples](/yr/examples) or project [wiki](https://github.com/wckd/python-yr/wiki) - -Pull requests are very welcomed! :-) - -#### Changelog - -1.4.0 (2014 Sep 12) - -* Add support for yr.no api service ~> thanks to lucadelu -* Add hourly forecast ~> thanks to antorweep1987 - -1.3.2 (2014 Jul 11) - -* Improved exception-handling, thanks @mbambas! - -1.3.1.1 (2014 Jul 10) - -* Bugfix: pypi/pip installer in 'setup.py' - -1.3.1 (2014 Jul 10) - -* Bugfix: caching mechanism in 'is_fresh' function ~> thanks to antorweep -* Improve examples diff --git a/README.rst b/README.rst new file mode 100755 index 0000000..6857cf4 --- /dev/null +++ b/README.rst @@ -0,0 +1,65 @@ +========= +python-yr +========= + +Library for the norwegian wheather service yr.no_ in python_. + +Usage +===== + +.. code:: python + + from yr.libyr import Yr + + weather = Yr(location_name='Norge/Telemark/Skien/Skien') + now = weather.now(as_json=True) + + print(now) + +This returns +============ + +.. code:: json + + { + "@from": "2014-06-04T08:00:00", + "@to": "2014-06-04T12:00:00", + "@period": "1", + "symbol": { + "@number": "3", + "@numberEx": "3", + "@name": "Partly cloudy", + "@var": "03d" + }, + "precipitation": { + "@value": "0", + "@minvalue": "0", + "@maxvalue": "0.1" + }, + "windDirection": { + "@deg": "159.4", + "@code": "SSE", + "@name": "South-southeast" + }, + "windSpeed": { + "@mps": "1.3", + "@name": "Light air" + }, + "temperature": { + "@unit": "celsius", + "@value": "13" + }, + "pressure": { + "@unit": "hPa", + "@value": "1012.1" + } + } + +For more usage examples visit folder examples_ or project wiki_ + +Pull requests are very welcomed! :-) + +.. _yr.no: http://www.yr.no/ +.. _python: http://www.python.org/ +.. _examples: https://github.com/wckd/python-yr/blob/master/yr/examples +.. _wiki: https://github.com/wckd/python-yr/wiki diff --git a/setup.py b/setup.py index ed221fe..14eebb0 100644 --- a/setup.py +++ b/setup.py @@ -5,33 +5,24 @@ except ImportError: from distutils.core import setup -long_description = open('README.md').read() - setup( name = 'python-yr', - version = '1.4.0', + version = '1.4.1', description = 'Get the forecast from the norwegian wheather service yr.no in python', - long_description = long_description, + long_description = open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author = 'Alexander Hansen', author_email = 'alexander.l.hansen@gmail.com', maintainer = 'GNU Knight', maintainer_email = 'idxxx23@gmail.com', url = 'https://github.com/wckd/python-yr', packages = ['yr'], - package_data = { - 'yr': [ - 'examples/*.py', - 'languages/*.json', - 'locations/*.gz', - ] - }, - classifiers = [ + classifiers = [ # https://pypi.python.org/pypi?%3Aaction=list_classifiers + 'Programming Language :: Python :: 3', + 'Programming Language :: Python', + 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'Operating System :: OS Independent', 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', - 'Operating System :: POSIX', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', 'Topic :: Internet', ], install_requires = ['xmltodict'], # $$solve$$ ~> /usr/lib/python3.4/distutils/dist.py:260: UserWarning: Unknown distribution option: 'install_requires' warnings.warn(msg) From e9e65142cf22626405a0e54a7ff2d8af5def8b44 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sun, 28 Dec 2014 02:16:28 +0100 Subject: [PATCH 53/79] Added remove function to Cache --- yr/utils.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/yr/utils.py b/yr/utils.py index 978d556..8549a62 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -185,6 +185,13 @@ def load(self): with open(self.filename, mode='r', encoding=self.encoding) as f: return f.read() + def remove(self): + if os.path.isfile(self.filename): + os.remove(self.filename) + return True + else: + return False + if __name__ == '__main__': logging.basicConfig(level=logging.DEBUG) logging.info('starting __main__') From 142093dd2d68734c400b118978106a5800d52254 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sun, 28 Dec 2014 02:26:40 +0100 Subject: [PATCH 54/79] Removed returning bool on the remove function in Cache --- yr/utils.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 8549a62..5cea85e 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -188,9 +188,6 @@ def load(self): def remove(self): if os.path.isfile(self.filename): os.remove(self.filename) - return True - else: - return False if __name__ == '__main__': logging.basicConfig(level=logging.DEBUG) From e1ff07a595d2bcfd23d2ad72ce6d9303812c0a86 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sun, 28 Dec 2014 02:51:59 +0100 Subject: [PATCH 55/79] Small changes to Connect and Cache --- yr/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 5cea85e..aad52cf 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -143,6 +143,7 @@ def read(self): if response.status != 200: raise weatherdata = response.read().decode(self.encoding) + cache.remove() cache.dump(weatherdata) else: weatherdata = cache.load() @@ -167,7 +168,7 @@ def __init__(self, location): ) def dump(self, data): - logging.info('write caching: {}'.format(self.filename)) + logging.info('writing cachefile: {}'.format(self.filename)) with open(self.filename, mode='w', encoding=self.encoding) as f: f.write(data) @@ -181,12 +182,13 @@ def exists(self): return os.path.isfile(self.filename) def load(self): - logging.info('read from cache: {}'.format(self.filename)) + logging.info('read from cachefile: {}'.format(self.filename)) with open(self.filename, mode='r', encoding=self.encoding) as f: return f.read() def remove(self): if os.path.isfile(self.filename): + logging.info('removing cachefile: {}'.format(self.filename)) os.remove(self.filename) if __name__ == '__main__': From 5b6f32b06fc05062165990017a80bbdd451dda11 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sun, 28 Dec 2014 02:55:04 +0100 Subject: [PATCH 56/79] Updated log-message on remove function in Cache --- yr/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yr/utils.py b/yr/utils.py index aad52cf..553eaec 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -188,7 +188,7 @@ def load(self): def remove(self): if os.path.isfile(self.filename): - logging.info('removing cachefile: {}'.format(self.filename)) + logging.info('removing existing cachefile before dump: {}'.format(self.filename)) os.remove(self.filename) if __name__ == '__main__': From 46b86f317113a94e348864c2a838f3f41b71415b Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sun, 28 Dec 2014 03:26:23 +0100 Subject: [PATCH 57/79] Small change --- yr/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 553eaec..4521acd 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -143,7 +143,6 @@ def read(self): if response.status != 200: raise weatherdata = response.read().decode(self.encoding) - cache.remove() cache.dump(weatherdata) else: weatherdata = cache.load() @@ -188,7 +187,7 @@ def load(self): def remove(self): if os.path.isfile(self.filename): - logging.info('removing existing cachefile before dump: {}'.format(self.filename)) + logging.info('removing cachefile: {}'.format(self.filename)) os.remove(self.filename) if __name__ == '__main__': From 3f13a780b73307b2ab91cfaf7f47df1a935faf8f Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Wed, 4 Feb 2015 09:34:55 +0100 Subject: [PATCH 58/79] Update utils.py Log after the cache-file has been removed --- yr/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yr/utils.py b/yr/utils.py index 4521acd..6c7550d 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -187,8 +187,8 @@ def load(self): def remove(self): if os.path.isfile(self.filename): - logging.info('removing cachefile: {}'.format(self.filename)) os.remove(self.filename) + logging.info('removed cachefile: {}'.format(self.filename)) if __name__ == '__main__': logging.basicConfig(level=logging.DEBUG) From dd2b23f0da021272c5f319267e748d230c02a5ae Mon Sep 17 00:00:00 2001 From: Peter Helbing Date: Sat, 28 Feb 2015 15:29:58 +0100 Subject: [PATCH 59/79] setup: explicit installation of language-specific JSON files --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py index 14eebb0..99efbfb 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,10 @@ 'Intended Audience :: Developers', 'Topic :: Internet', ], + package_data={ + 'yr': [ + 'languages/*.json', + ], + }, install_requires = ['xmltodict'], # $$solve$$ ~> /usr/lib/python3.4/distutils/dist.py:260: UserWarning: Unknown distribution option: 'install_requires' warnings.warn(msg) ) From 35c0e42bad8c58be724e2f25c402b32c7fc8f43a Mon Sep 17 00:00:00 2001 From: Samarendra M Hedaoo Date: Mon, 20 Apr 2015 21:43:10 +0530 Subject: [PATCH 60/79] Now we check the freshness of cache based on nextupdate tag in meta Fixes #26 --- yr/utils.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 6c7550d..3823b97 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -8,6 +8,7 @@ import datetime # Cache import urllib.request # Connect import urllib.parse # Location +import xmltodict class YrObject: @@ -171,11 +172,17 @@ def dump(self, data): with open(self.filename, mode='w', encoding=self.encoding) as f: f.write(data) + def valid_until_timestamp_from_file(self): + xmldata = self.load() + d = xmltodict.parse(xmldata) + next_update = d['weatherdata']['meta']['nextupdate'] + valid_until = datetime.datetime.strptime(next_update,"%Y-%m-%dT%H:%M:%S") + logging.info('Cache is valid until {}'.format(valid_until)) + return valid_until + def is_fresh(self): - mtime = datetime.datetime.fromtimestamp(os.path.getmtime(self.filename)) - now = datetime.datetime.now() - timeout = datetime.timedelta(minutes=self.timeout) - return now - mtime <= timeout # thanks for the fix antorweep + logging.info('Now is {}'.format(datetime.datetime.now())) + return datetime.datetime.now() <= self.valid_until_timestamp_from_file() def exists(self): return os.path.isfile(self.filename) From 4edfc0d14e6a839e3157371d6ea98c5e35ce8e4a Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 21 Apr 2015 09:20:03 +0200 Subject: [PATCH 61/79] 1.4.2 --- CHANGES.rst | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 102206f..2b174f9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,12 @@ Changelog ========= +1.4.2 (2015 Apr 21) + +* add remove function to Cache +* add explicit installation of language-specific JSON files to setup ~> thanx to kurisuke_ +* check the freshness of cache based on nextupdate tag in meta ~> thanx to knightsamar_ + 1.4.1 (2014 Dec 11) * add logging support @@ -36,3 +42,5 @@ Changelog .. _antorweep1987: https://github.com/antorweep1987 .. _mbambas: https://github.com/mbambas .. _lucadelu: https://github.com/lucadelu +.. _kurisuke: https://github.com/kurisuke +.. _knightsamar: https://github.com/knightsamar diff --git a/setup.py b/setup.py index 99efbfb..bdfdf8c 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name = 'python-yr', - version = '1.4.1', + version = '1.4.2', description = 'Get the forecast from the norwegian wheather service yr.no in python', long_description = open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author = 'Alexander Hansen', From 625b841b5e331ad10587f860c9701d241e1a0479 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 21 Apr 2015 11:34:12 +0200 Subject: [PATCH 62/79] mod README ~> add Pull requests + Branches --- README.rst | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 6857cf4..1d7a4c0 100755 --- a/README.rst +++ b/README.rst @@ -4,6 +4,20 @@ python-yr Library for the norwegian wheather service yr.no_ in python_. +Pull requests +============= + +Please everyone involved to generate demands and plans (pull requests), so we could set targets for next version 1.5 ;) + +Branches +======== + +* develop_, the main (default) branch for development on GitHub_ +* master_, branch for the stable release published on PyPi_ +* python2_, branch with support for Python2 +* csv-support_, branch with support for CSV export forecasts +* ... + Usage ===== @@ -57,9 +71,13 @@ This returns For more usage examples visit folder examples_ or project wiki_ -Pull requests are very welcomed! :-) - .. _yr.no: http://www.yr.no/ .. _python: http://www.python.org/ +.. _develop: https://github.com/wckd/python-yr/tree/develop +.. _GitHub: https://github.com/wckd/python-yr/ +.. _master: https://github.com/wckd/python-yr/tree/master +.. _PyPi: https://pypi.python.org/pypi/python-yr/ +.. _python2: https://github.com/wckd/python-yr/tree/python2 +.. _csv-support: https://github.com/wckd/python-yr/tree/csv-support .. _examples: https://github.com/wckd/python-yr/blob/master/yr/examples .. _wiki: https://github.com/wckd/python-yr/wiki From 63feadc46db846169c76e20c102f3c12466e8511 Mon Sep 17 00:00:00 2001 From: idxxx23 Date: Tue, 21 Apr 2015 11:49:08 +0200 Subject: [PATCH 63/79] mod README ~> add Install --- README.rst | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/README.rst b/README.rst index 1d7a4c0..3968c8d 100755 --- a/README.rst +++ b/README.rst @@ -2,21 +2,14 @@ python-yr ========= -Library for the norwegian wheather service yr.no_ in python_. +Library for the norwegian wheather service YR.no_ in Python_. -Pull requests -============= +Install (easiest way) +===================== -Please everyone involved to generate demands and plans (pull requests), so we could set targets for next version 1.5 ;) +.. code:: bash -Branches -======== - -* develop_, the main (default) branch for development on GitHub_ -* master_, branch for the stable release published on PyPi_ -* python2_, branch with support for Python2 -* csv-support_, branch with support for CSV export forecasts -* ... + pip3 install python-yr Usage ===== @@ -71,13 +64,27 @@ This returns For more usage examples visit folder examples_ or project wiki_ -.. _yr.no: http://www.yr.no/ -.. _python: http://www.python.org/ +Pull requests +============= + +Please everyone involved to generate demands and plans (pull requests), so we could set targets for next version 1.5 ;) + +Branches +======== + +* develop_, the main (default) branch for development on GitHub_ +* master_, branch for the stable release published on PyPi_ +* python2_, branch with support for Python2 +* csv-support_, branch with support for CSV export forecasts +* ... + +.. _YR.no: http://www.yr.no/ +.. _Python: http://www.python.org/ +.. _examples: https://github.com/wckd/python-yr/blob/master/yr/examples +.. _wiki: https://github.com/wckd/python-yr/wiki .. _develop: https://github.com/wckd/python-yr/tree/develop .. _GitHub: https://github.com/wckd/python-yr/ .. _master: https://github.com/wckd/python-yr/tree/master .. _PyPi: https://pypi.python.org/pypi/python-yr/ .. _python2: https://github.com/wckd/python-yr/tree/python2 .. _csv-support: https://github.com/wckd/python-yr/tree/csv-support -.. _examples: https://github.com/wckd/python-yr/blob/master/yr/examples -.. _wiki: https://github.com/wckd/python-yr/wiki From db9d0eb1300bcf680eca7115469157129529462e Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Tue, 21 Apr 2015 15:30:34 +0200 Subject: [PATCH 64/79] Updated author_email --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bdfdf8c..38a07b6 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ description = 'Get the forecast from the norwegian wheather service yr.no in python', long_description = open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author = 'Alexander Hansen', - author_email = 'alexander.l.hansen@gmail.com', + author_email = 'alexander@alexanderhansen.no', maintainer = 'GNU Knight', maintainer_email = 'idxxx23@gmail.com', url = 'https://github.com/wckd/python-yr', From aa72f262502c84bdc6584c1911c1221e2be79983 Mon Sep 17 00:00:00 2001 From: Hugo Shamrock Date: Wed, 12 Aug 2015 09:27:52 +0200 Subject: [PATCH 65/79] Updated maintainer_email --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 38a07b6..add9629 100644 --- a/setup.py +++ b/setup.py @@ -12,8 +12,8 @@ long_description = open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author = 'Alexander Hansen', author_email = 'alexander@alexanderhansen.no', - maintainer = 'GNU Knight', - maintainer_email = 'idxxx23@gmail.com', + maintainer = 'Hugo Shamrock', + maintainer_email = 'hugo.shamrock@gmail.com', url = 'https://github.com/wckd/python-yr', packages = ['yr'], classifiers = [ # https://pypi.python.org/pypi?%3Aaction=list_classifiers From 9457183805d0560f4a779e9f12e1824015d4507c Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Thu, 3 Sep 2015 22:32:39 +0200 Subject: [PATCH 66/79] Bumping version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index add9629..03c4b2f 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name = 'python-yr', - version = '1.4.2', + version = '1.4.3', description = 'Get the forecast from the norwegian wheather service yr.no in python', long_description = open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author = 'Alexander Hansen', From af442d0e89c5ad99708cb602387f5a40079256a7 Mon Sep 17 00:00:00 2001 From: merry-bits Date: Mon, 30 Nov 2015 09:43:19 +0100 Subject: [PATCH 67/79] Added named logger. --- yr/utils.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 3823b97..bc0c819 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -10,6 +10,10 @@ import urllib.parse # Location import xmltodict + +log = logging.getLogger(__name__) + + class YrObject: script_directory = os.path.dirname(os.path.abspath(__file__)) # directory of the script @@ -18,7 +22,7 @@ class YrObject: class YrException(Exception): def __init__(self, message): - logging.error(message) + log.error(message) raise class Language(YrObject): @@ -41,7 +45,7 @@ def __init__(self, language_name=default_language_name): def get_dictionary(self): try: - logging.info('read language dictionary: {}'.format(self.filename)) + log.info('read language dictionary: {}'.format(self.filename)) with open(self.filename, mode='r', encoding=self.encoding) as f: return json.load(f) except Exception as e: @@ -133,13 +137,13 @@ def __init__(self, location): def read(self): try: - logging.info('weatherdata request: {}, forecast-link: {}'.format( + log.info('weatherdata request: {}, forecast-link: {}'.format( self.location.location_name, self.location.forecast_link, )) cache = Cache(self.location) if not cache.exists() or not cache.is_fresh(): - logging.info('read online: {}'.format(self.location.url)) + log.info('read online: {}'.format(self.location.url)) response = urllib.request.urlopen(self.location.url) if response.status != 200: raise @@ -168,7 +172,7 @@ def __init__(self, location): ) def dump(self, data): - logging.info('writing cachefile: {}'.format(self.filename)) + log.info('writing cachefile: {}'.format(self.filename)) with open(self.filename, mode='w', encoding=self.encoding) as f: f.write(data) @@ -177,25 +181,25 @@ def valid_until_timestamp_from_file(self): d = xmltodict.parse(xmldata) next_update = d['weatherdata']['meta']['nextupdate'] valid_until = datetime.datetime.strptime(next_update,"%Y-%m-%dT%H:%M:%S") - logging.info('Cache is valid until {}'.format(valid_until)) + log.info('Cache is valid until {}'.format(valid_until)) return valid_until def is_fresh(self): - logging.info('Now is {}'.format(datetime.datetime.now())) + log.info('Now is {}'.format(datetime.datetime.now())) return datetime.datetime.now() <= self.valid_until_timestamp_from_file() def exists(self): return os.path.isfile(self.filename) def load(self): - logging.info('read from cachefile: {}'.format(self.filename)) + log.info('read from cachefile: {}'.format(self.filename)) with open(self.filename, mode='r', encoding=self.encoding) as f: return f.read() def remove(self): if os.path.isfile(self.filename): os.remove(self.filename) - logging.info('removed cachefile: {}'.format(self.filename)) + log.info('removed cachefile: {}'.format(self.filename)) if __name__ == '__main__': logging.basicConfig(level=logging.DEBUG) From 95a960f3321b653da6d2d1409836a4d438dbc4f9 Mon Sep 17 00:00:00 2001 From: Hugo Shamrock Date: Wed, 11 Nov 2015 12:18:21 +0100 Subject: [PATCH 68/79] fix|valid source code with pep ignore pep8 e501 ignore pep257 --- setup.py | 24 +++++++++++------------ yr/libyr.py | 24 +++++++++++------------ yr/utils.py | 55 +++++++++++++++++++++++++++++------------------------ 3 files changed, 54 insertions(+), 49 deletions(-) diff --git a/setup.py b/setup.py index 03c4b2f..629234d 100644 --- a/setup.py +++ b/setup.py @@ -6,17 +6,17 @@ from distutils.core import setup setup( - name = 'python-yr', - version = '1.4.3', - description = 'Get the forecast from the norwegian wheather service yr.no in python', - long_description = open('README.rst').read() + '\n' + open('CHANGES.rst').read(), - author = 'Alexander Hansen', - author_email = 'alexander@alexanderhansen.no', - maintainer = 'Hugo Shamrock', - maintainer_email = 'hugo.shamrock@gmail.com', - url = 'https://github.com/wckd/python-yr', - packages = ['yr'], - classifiers = [ # https://pypi.python.org/pypi?%3Aaction=list_classifiers + name='python-yr', + version='1.4.3', + description='Get the forecast from the norwegian wheather service yr.no in python', + long_description=open('README.rst').read() + '\n' + open('CHANGES.rst').read(), + author='Alexander Hansen', + author_email='alexander@alexanderhansen.no', + maintainer='Hugo Shamrock', + maintainer_email='hugo.shamrock@gmail.com', + url='https://github.com/wckd/python-yr', + packages=['yr'], + classifiers=[ # https://pypi.python.org/pypi?%3Aaction=list_classifiers 'Programming Language :: Python :: 3', 'Programming Language :: Python', 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', @@ -30,5 +30,5 @@ 'languages/*.json', ], }, - install_requires = ['xmltodict'], # $$solve$$ ~> /usr/lib/python3.4/distutils/dist.py:260: UserWarning: Unknown distribution option: 'install_requires' warnings.warn(msg) + install_requires=['xmltodict'], # $$solve$$ ~> /usr/lib/python3.4/distutils/dist.py:260: UserWarning: Unknown distribution option: 'install_requires' warnings.warn(msg) ) diff --git a/yr/libyr.py b/yr/libyr.py index 137dd0a..9fd3081 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 import logging -import sys import json -import xmltodict # <~ the only external dependency +import xmltodict # <~ the only external dependency from yr.utils import Connect, Location, API_Locationforecast, Language, YrException + class Yr: default_forecast_link = 'forecast' @@ -20,7 +20,7 @@ def xml2dict(self, xml): def dict2xml(self, dictionary): return xmltodict.unparse(dictionary, pretty=True) - def py2result(self, python, as_json=False): # default is return result as dictionary ;) + def py2result(self, python, as_json=False): # default is return result as dictionary ;) if as_json: return self.py2json(python) else: @@ -44,15 +44,15 @@ def __init__( location_xyz=None, forecast_link=default_forecast_link, language_name=default_language_name, - ): - self.forecast_link = forecast_link + ): + self.forecast_link = forecast_link self.language_name = language_name self.language = Language(language_name=self.language_name) if location_xyz: coordinates = (location_xyz[1], location_xyz[0], location_xyz[2]) self.location_xyz = location_xyz - + if location_name: self.location_name = location_name self.coordinates = None @@ -87,25 +87,25 @@ def __init__( forecast_link='forecast', language_name='en', ).now(as_json=True) - #print(weatherdata) + # print(weatherdata) weatherdata = Yr( location_name='Czech_Republic/Prague/Prague', forecast_link='forecast_hour_by_hour', language_name='en', ).now(as_json=True) - #print(weatherdata) + # print(weatherdata) weatherdata = Yr( - location_xyz=(14.4656239,50.0596696,11), + location_xyz=(14.4656239, 50.0596696, 11), language_name='en', ).now(as_json=True) - #print(weatherdata) + # print(weatherdata) weatherdata = Yr( - coordinates=(50.0596696,14.4656239,11), + coordinates=(50.0596696, 14.4656239, 11), language_name='en', ).now(as_json=True) - #print(weatherdata) + # print(weatherdata) logging.info('stopping __main__') diff --git a/yr/utils.py b/yr/utils.py index bc0c819..a30ba16 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -1,30 +1,30 @@ #!/usr/bin/env python3 import logging -import sys import os.path -import json # Language -import tempfile # Cache -import datetime # Cache -import urllib.request # Connect -import urllib.parse # Location +import json # Language +import tempfile # Cache +import datetime # Cache +import urllib.request # Connect +import urllib.parse # Location import xmltodict - log = logging.getLogger(__name__) class YrObject: - script_directory = os.path.dirname(os.path.abspath(__file__)) # directory of the script + script_directory = os.path.dirname(os.path.abspath(__file__)) # directory of the script encoding = 'utf-8' + class YrException(Exception): def __init__(self, message): log.error(message) raise + class Language(YrObject): directory = 'languages' @@ -37,9 +37,9 @@ def __init__(self, language_name=default_language_name): self.script_directory, self.directory, '{language_name}.{extension}'.format( - language_name = self.language_name, - extension = self.extension, - ), # basename of filename + language_name=self.language_name, + extension=self.extension, + ), # basename of filename ) self.dictionary = self.get_dictionary() @@ -51,6 +51,7 @@ def get_dictionary(self): except Exception as e: raise YrException(e) + class Location(YrObject): base_url = 'http://www.yr.no/' @@ -62,7 +63,7 @@ def __init__(self, location_name, forecast_link=default_forecast_link, language= self.location_name = location_name self.language = language if isinstance(language, Language) else Language() - if forecast_link in self.forecast_links: # must be valid forecast_link + if forecast_link in self.forecast_links: # must be valid forecast_link self.forecast_link = self.language.dictionary[forecast_link] else: self.forecast_link = self.default_forecast_link @@ -72,11 +73,11 @@ def __init__(self, location_name, forecast_link=default_forecast_link, language= def get_url(self): return '{base_url}{place}/{location_name}/{forecast_link}.{extension}'.format( - base_url = self.base_url, - place = self.language.dictionary['place'], - location_name = urllib.parse.quote(self.location_name), - forecast_link = self.forecast_link, - extension = self.extension, + base_url=self.base_url, + place=self.language.dictionary['place'], + location_name=urllib.parse.quote(self.location_name), + forecast_link=self.forecast_link, + extension=self.extension, ) def get_hash(self): @@ -85,6 +86,7 @@ def get_hash(self): forecast_link=self.forecast_link, ) + class API_Locationforecast(YrObject): """Class to use the API of yr.no""" @@ -100,7 +102,7 @@ def __init__(self, lat, lon, msl=0, language=False): """ self.coordinates = dict(lat=lat, lon=lon, msl=msl) self.location_name = 'lat={lat};lon={lon};msl={msl}'.format(**self.coordinates) - #self.language = language if isinstance(language, Language) else Language() + # self.language = language if isinstance(language, Language) else Language() self.url = self.get_url() self.hash = self.get_hash() @@ -118,7 +120,8 @@ def get_hash(self): forecast_link=self.forecast_link, ) -class LocationXYZ(API_Locationforecast): # ~> Deprecated!!! + +class LocationXYZ(API_Locationforecast): # ~> Deprecated!!! """Class to use the API of yr.no""" def __init__(self, x, y, z=0, language=False): @@ -130,6 +133,7 @@ def __init__(self, x, y, z=0, language=False): """ super().__init__(y, x, z, language) + class Connect(YrObject): def __init__(self, location): @@ -155,11 +159,12 @@ def read(self): except Exception as e: raise YrException(e) + class Cache(YrObject): directory = tempfile.gettempdir() extension = 'xml' - timeout = 15 # cache timeout in minutes + timeout = 15 # cache timeout in minutes def __init__(self, location): self.location = location @@ -168,7 +173,7 @@ def __init__(self, location): '{location_hash}.{extension}'.format( location_hash=self.location.hash, extension=self.extension, - ), # basename of filename + ), # basename of filename ) def dump(self, data): @@ -180,7 +185,7 @@ def valid_until_timestamp_from_file(self): xmldata = self.load() d = xmltodict.parse(xmldata) next_update = d['weatherdata']['meta']['nextupdate'] - valid_until = datetime.datetime.strptime(next_update,"%Y-%m-%dT%H:%M:%S") + valid_until = datetime.datetime.strptime(next_update, "%Y-%m-%dT%H:%M:%S") log.info('Cache is valid until {}'.format(valid_until)) return valid_until @@ -210,14 +215,14 @@ def remove(self): forecast_link='forecast', language=Language(language_name='en'), )).read() - #print(weatherdata) + # print(weatherdata) weatherdata = Connect(Location( location_name='Czech_Republic/Prague/Prague', forecast_link='forecast_hour_by_hour', language=Language(language_name='en'), )).read() - #print(weatherdata) + # print(weatherdata) weatherdata = Connect(API_Locationforecast( 50.0596696, @@ -225,6 +230,6 @@ def remove(self): 11, language=Language(language_name='en'), )).read() - #print(weatherdata) + # print(weatherdata) logging.info('stopping __main__') From f0d16f1617a55e9962dd3c0680d5d0e58bfb5458 Mon Sep 17 00:00:00 2001 From: Hugo Shamrock Date: Thu, 17 Dec 2015 09:39:05 +0100 Subject: [PATCH 69/79] fix #30 API_Locationforecast ++ @nextrun --- yr/libyr.py | 6 ++++++ yr/utils.py | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/yr/libyr.py b/yr/libyr.py index 9fd3081..4805c91 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -108,4 +108,10 @@ def __init__( ).now(as_json=True) # print(weatherdata) + weatherdata = Yr( + coordinates=(63.4066631, 10.4426724, 10), + language_name='en' + ).now(as_json=True) + # print(weatherdata) + logging.info('stopping __main__') diff --git a/yr/utils.py b/yr/utils.py index a30ba16..87ce7a5 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -184,8 +184,21 @@ def dump(self, data): def valid_until_timestamp_from_file(self): xmldata = self.load() d = xmltodict.parse(xmldata) - next_update = d['weatherdata']['meta']['nextupdate'] - valid_until = datetime.datetime.strptime(next_update, "%Y-%m-%dT%H:%M:%S") + # hotfix API_Locationforecast ++ @nextrun >>> + meta = d['weatherdata']['meta'] + if isinstance(self.location, API_Locationforecast): + if isinstance(meta['model'], dict): + next_update = meta['model']['@nextrun'] + elif isinstance(meta['model'], list): + next_update = meta['model'][0]['@nextrun'] + else: + return False + date_format = '%Y-%m-%dT%H:%M:%SZ' + else: + next_update = meta['nextupdate'] + date_format = '%Y-%m-%dT%H:%M:%S' + valid_until = datetime.datetime.strptime(next_update, date_format) + # hotfix API_Locationforecast ++ @nextrun <<< log.info('Cache is valid until {}'.format(valid_until)) return valid_until From 097d182ee74c600526b02a2ac0455b1ec08c93f7 Mon Sep 17 00:00:00 2001 From: Hugo Shamrock Date: Thu, 17 Dec 2015 09:53:44 +0100 Subject: [PATCH 70/79] mod ~> pep ;) --- yr/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yr/utils.py b/yr/utils.py index 87ce7a5..f97ee91 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -88,6 +88,7 @@ def get_hash(self): class API_Locationforecast(YrObject): + """Class to use the API of yr.no""" base_url = 'http://api.yr.no/weatherapi/locationforecast/1.9/?' @@ -122,6 +123,7 @@ def get_hash(self): class LocationXYZ(API_Locationforecast): # ~> Deprecated!!! + """Class to use the API of yr.no""" def __init__(self, x, y, z=0, language=False): From fa815c0302a5c6e647dcdc39fc1a7b8e54275a30 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Fri, 6 May 2016 17:02:30 +0200 Subject: [PATCH 71/79] Switched API_Locationforecast to https://api.met.no - fixing #34 --- yr/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index f97ee91..905d2f2 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -89,9 +89,9 @@ def get_hash(self): class API_Locationforecast(YrObject): - """Class to use the API of yr.no""" + """Class to use the API of api.met.no""" - base_url = 'http://api.yr.no/weatherapi/locationforecast/1.9/?' + base_url = 'https://api.met.no/weatherapi/locationforecast/1.9/?' forecast_link = 'locationforecast' def __init__(self, lat, lon, msl=0, language=False): From d0157b840b907b914f83c272f16b0c3df2204b18 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Fri, 6 May 2016 17:28:25 +0200 Subject: [PATCH 72/79] v1.4.4 bump.. --- CHANGES.rst | 4 ++++ setup.py | 2 +- yr/utils.py | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2b174f9..08fabca 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,10 @@ Changelog ========= +1.4.4 (2016 May 06) + +* switched API_Locationforecast to https://api.met.no - fixing #34 + 1.4.2 (2015 Apr 21) * add remove function to Cache diff --git a/setup.py b/setup.py index 629234d..01dcf3b 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='python-yr', - version='1.4.3', + version='1.4.4', description='Get the forecast from the norwegian wheather service yr.no in python', long_description=open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author='Alexander Hansen', diff --git a/yr/utils.py b/yr/utils.py index 905d2f2..4f6ee83 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -186,7 +186,6 @@ def dump(self, data): def valid_until_timestamp_from_file(self): xmldata = self.load() d = xmltodict.parse(xmldata) - # hotfix API_Locationforecast ++ @nextrun >>> meta = d['weatherdata']['meta'] if isinstance(self.location, API_Locationforecast): if isinstance(meta['model'], dict): From 44fe1afe881370446585b9af207eed2796ecb3dd Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Sun, 8 May 2016 17:31:53 +0200 Subject: [PATCH 73/79] Typo in description --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 3968c8d..ff8da4e 100755 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ python-yr ========= -Library for the norwegian wheather service YR.no_ in Python_. +Library for the norwegian weather service YR.no_ in Python_. Install (easiest way) ===================== From 85495ca3a23f870f132a3db3e66139b85d6dd721 Mon Sep 17 00:00:00 2001 From: fswane Date: Tue, 10 May 2016 06:59:16 +0200 Subject: [PATCH 74/79] Parse the 'nextrun' field from the cache file taking into account it is UTC time. This is only done when API_Locationforecast is used. --- yr/utils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yr/utils.py b/yr/utils.py index 4f6ee83..92ee9ff 100644 --- a/yr/utils.py +++ b/yr/utils.py @@ -194,11 +194,15 @@ def valid_until_timestamp_from_file(self): next_update = meta['model'][0]['@nextrun'] else: return False - date_format = '%Y-%m-%dT%H:%M:%SZ' + next_update = next_update.replace("Z", " +0000") + date_format = "%Y-%m-%dT%H:%M:%S %z" + # Read the UTC timestamp, convert to local time and remove the timezone information. + valid_until = datetime.datetime.strptime(next_update,date_format) + valid_until = valid_until.replace(tzinfo=datetime.timezone.utc).astimezone(tz=None).replace(tzinfo=None) else: next_update = meta['nextupdate'] date_format = '%Y-%m-%dT%H:%M:%S' - valid_until = datetime.datetime.strptime(next_update, date_format) + valid_until = datetime.datetime.strptime(next_update, date_format) # hotfix API_Locationforecast ++ @nextrun <<< log.info('Cache is valid until {}'.format(valid_until)) return valid_until From ddf1d6bb101f6a46348b66009fcb699be5f93ceb Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Thu, 19 May 2016 10:43:03 +0200 Subject: [PATCH 75/79] Updated CHANGES.rst - new version --- CHANGES.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 08fabca..2174ce0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,10 @@ Changelog ========= +1.4.5 (2016 May 19) + +* Parse the 'nextrun' field from the cache file as UTC time (API_Locationforecast) + 1.4.4 (2016 May 06) * switched API_Locationforecast to https://api.met.no - fixing #34 From 44cd0bc0c65c89513bd6625de9fac73af0085fe8 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Thu, 19 May 2016 10:47:37 +0200 Subject: [PATCH 76/79] bump version on setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 01dcf3b..91adb95 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='python-yr', - version='1.4.4', + version='1.4.5', description='Get the forecast from the norwegian wheather service yr.no in python', long_description=open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author='Alexander Hansen', From 1a78d6dc411dcd6fa75e76af2834e9f47c3af656 Mon Sep 17 00:00:00 2001 From: Alexander Hansen Date: Fri, 20 Apr 2018 08:47:30 +0200 Subject: [PATCH 77/79] Made msl in xyz optional --- setup.py | 2 +- yr/libyr.py | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 91adb95..8db70fa 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='python-yr', - version='1.4.5', + version='1.4.6', description='Get the forecast from the norwegian wheather service yr.no in python', long_description=open('README.rst').read() + '\n' + open('CHANGES.rst').read(), author='Alexander Hansen', diff --git a/yr/libyr.py b/yr/libyr.py index 4805c91..615a482 100644 --- a/yr/libyr.py +++ b/yr/libyr.py @@ -50,7 +50,10 @@ def __init__( self.language = Language(language_name=self.language_name) if location_xyz: - coordinates = (location_xyz[1], location_xyz[0], location_xyz[2]) + if len(location_xyz) > 2: + coordinates = (location_xyz[1], location_xyz[0], location_xyz[2]) + else: + coordinates = (location_xyz[1], location_xyz[0]) self.location_xyz = location_xyz if location_name: @@ -64,12 +67,19 @@ def __init__( elif coordinates: self.location_name = None self.coordinates = coordinates - self.location = API_Locationforecast( - lat=self.coordinates[0], - lon=self.coordinates[1], - msl=self.coordinates[2], - language=self.language, - ) + if len(self.coordinates) > 2: + self.location = API_Locationforecast( + lat=self.coordinates[0], + lon=self.coordinates[1], + msl=self.coordinates[2], + language=self.language, + ) + else: + self.location = API_Locationforecast( + lat=self.coordinates[0], + lon=self.coordinates[1], + language=self.language, + ) else: raise YrException('location_name or location_xyz parameter must be set') From 332018b88544c6d00e5b4ba72ab5e9079555a7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20von=20Streng=20H=C3=A6hre?= Date: Sun, 16 Jun 2019 12:53:24 +0200 Subject: [PATCH 78/79] Quick and (very) dirty asyncio adaptation of python-yr --- .gitignore | 4 ++ CHANGES.rst | 54 ------------------- MANIFEST.in | 5 -- README.rst | 38 ++----------- {yr => ayr}/__init__.py | 0 {yr => ayr}/examples/credit.py | 0 {yr => ayr}/examples/dictionary.py | 0 {yr => ayr}/examples/forecast.py | 0 {yr => ayr}/examples/forecast_hour_by_hour.py | 0 .../examples/forecast_hour_by_hour_json.py | 0 {yr => ayr}/examples/forecast_json.py | 0 {yr => ayr}/examples/forecast_xyz.py | 0 {yr => ayr}/examples/now.py | 0 {yr => ayr}/examples/now_json.py | 0 {yr => ayr}/examples/wuurrd.py | 0 {yr => ayr}/examples/xml_source.py | 0 {yr => ayr}/internal/module_path.py | 0 {yr => ayr}/languages/en.json | 0 {yr => ayr}/languages/nb.json | 0 {yr => ayr}/languages/nn.json | 0 yr/libyr.py => ayr/libayr.py | 47 +++++++++------- {yr => ayr}/utils.py | 13 ++--- setup.py | 34 ------------ 23 files changed, 45 insertions(+), 150 deletions(-) delete mode 100644 CHANGES.rst delete mode 100644 MANIFEST.in rename {yr => ayr}/__init__.py (100%) rename {yr => ayr}/examples/credit.py (100%) rename {yr => ayr}/examples/dictionary.py (100%) rename {yr => ayr}/examples/forecast.py (100%) rename {yr => ayr}/examples/forecast_hour_by_hour.py (100%) rename {yr => ayr}/examples/forecast_hour_by_hour_json.py (100%) rename {yr => ayr}/examples/forecast_json.py (100%) rename {yr => ayr}/examples/forecast_xyz.py (100%) rename {yr => ayr}/examples/now.py (100%) rename {yr => ayr}/examples/now_json.py (100%) rename {yr => ayr}/examples/wuurrd.py (100%) rename {yr => ayr}/examples/xml_source.py (100%) rename {yr => ayr}/internal/module_path.py (100%) rename {yr => ayr}/languages/en.json (100%) rename {yr => ayr}/languages/nb.json (100%) rename {yr => ayr}/languages/nn.json (100%) rename yr/libyr.py => ayr/libayr.py (77%) rename {yr => ayr}/utils.py (96%) delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index d2d6f36..98ca521 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,7 @@ nosetests.xml .mr.developer.cfg .project .pydevproject + +# Sublime Text +*.sublime-project +*.sublime-workspace \ No newline at end of file diff --git a/CHANGES.rst b/CHANGES.rst deleted file mode 100644 index 2174ce0..0000000 --- a/CHANGES.rst +++ /dev/null @@ -1,54 +0,0 @@ -Changelog -========= - -1.4.5 (2016 May 19) - -* Parse the 'nextrun' field from the cache file as UTC time (API_Locationforecast) - -1.4.4 (2016 May 06) - -* switched API_Locationforecast to https://api.met.no - fixing #34 - -1.4.2 (2015 Apr 21) - -* add remove function to Cache -* add explicit installation of language-specific JSON files to setup ~> thanx to kurisuke_ -* check the freshness of cache based on nextupdate tag in meta ~> thanx to knightsamar_ - -1.4.1 (2014 Dec 11) - -* add logging support -* mod some variables -* mod catching exceptions -* rewrite LocationXYZ functionality to API_Locationforecast - * swap longitude and latitude - * add self.coordinates - * add self.location_name ~> not ideal, so it will probably change in future -* add LocationXYZ wrapper over API_Locationforecast for backward compatibility -* mod hash names for temporary files -* improve setup.py -* mod README from Markdown to reStructuredText - -1.4.0 (2014 Sep 12) - -* add support for yr.no api service ~> thanks to lucadelu_ -* add hourly forecast ~> thanks to antorweep1987_ - -1.3.2 (2014 Jul 11) - -* improve exception-handling ~> thanks to mbambas_ - -1.3.1.1 (2014 Jul 10) - -* bugfix: pypi/pip installer in 'setup.py' - -1.3.1 (2014 Jul 10) - -* bugfix: caching mechanism in 'is_fresh' function ~> thanks to antorweep1987_ -* improve examples - -.. _antorweep1987: https://github.com/antorweep1987 -.. _mbambas: https://github.com/mbambas -.. _lucadelu: https://github.com/lucadelu -.. _kurisuke: https://github.com/kurisuke -.. _knightsamar: https://github.com/knightsamar diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index c186ac6..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,5 +0,0 @@ -include COPYING.txt -include README.rst -include CHANGES.rst -recursive-include yr/languages * -recursive-include yr/examples * diff --git a/README.rst b/README.rst index ff8da4e..daea923 100755 --- a/README.rst +++ b/README.rst @@ -2,24 +2,17 @@ python-yr ========= -Library for the norwegian weather service YR.no_ in Python_. - -Install (easiest way) -===================== - -.. code:: bash - - pip3 install python-yr +Asynchronous library for the norwegian weather service YR.no_ in Python_. Forked from python-yr_ by wkcd_. Usage ===== .. code:: python - from yr.libyr import Yr + from ayr.libayr import Yr weather = Yr(location_name='Norge/Telemark/Skien/Skien') - now = weather.now(as_json=True) + now = await weather.now(as_json=True) print(now) @@ -62,29 +55,8 @@ This returns } } -For more usage examples visit folder examples_ or project wiki_ - -Pull requests -============= - -Please everyone involved to generate demands and plans (pull requests), so we could set targets for next version 1.5 ;) - -Branches -======== - -* develop_, the main (default) branch for development on GitHub_ -* master_, branch for the stable release published on PyPi_ -* python2_, branch with support for Python2 -* csv-support_, branch with support for CSV export forecasts -* ... .. _YR.no: http://www.yr.no/ .. _Python: http://www.python.org/ -.. _examples: https://github.com/wckd/python-yr/blob/master/yr/examples -.. _wiki: https://github.com/wckd/python-yr/wiki -.. _develop: https://github.com/wckd/python-yr/tree/develop -.. _GitHub: https://github.com/wckd/python-yr/ -.. _master: https://github.com/wckd/python-yr/tree/master -.. _PyPi: https://pypi.python.org/pypi/python-yr/ -.. _python2: https://github.com/wckd/python-yr/tree/python2 -.. _csv-support: https://github.com/wckd/python-yr/tree/csv-support +.. _python-yr: https://github.com/wckd/python-yr/ +.. -wkcd: https://github.com/wckd/python-yr/ \ No newline at end of file diff --git a/yr/__init__.py b/ayr/__init__.py similarity index 100% rename from yr/__init__.py rename to ayr/__init__.py diff --git a/yr/examples/credit.py b/ayr/examples/credit.py similarity index 100% rename from yr/examples/credit.py rename to ayr/examples/credit.py diff --git a/yr/examples/dictionary.py b/ayr/examples/dictionary.py similarity index 100% rename from yr/examples/dictionary.py rename to ayr/examples/dictionary.py diff --git a/yr/examples/forecast.py b/ayr/examples/forecast.py similarity index 100% rename from yr/examples/forecast.py rename to ayr/examples/forecast.py diff --git a/yr/examples/forecast_hour_by_hour.py b/ayr/examples/forecast_hour_by_hour.py similarity index 100% rename from yr/examples/forecast_hour_by_hour.py rename to ayr/examples/forecast_hour_by_hour.py diff --git a/yr/examples/forecast_hour_by_hour_json.py b/ayr/examples/forecast_hour_by_hour_json.py similarity index 100% rename from yr/examples/forecast_hour_by_hour_json.py rename to ayr/examples/forecast_hour_by_hour_json.py diff --git a/yr/examples/forecast_json.py b/ayr/examples/forecast_json.py similarity index 100% rename from yr/examples/forecast_json.py rename to ayr/examples/forecast_json.py diff --git a/yr/examples/forecast_xyz.py b/ayr/examples/forecast_xyz.py similarity index 100% rename from yr/examples/forecast_xyz.py rename to ayr/examples/forecast_xyz.py diff --git a/yr/examples/now.py b/ayr/examples/now.py similarity index 100% rename from yr/examples/now.py rename to ayr/examples/now.py diff --git a/yr/examples/now_json.py b/ayr/examples/now_json.py similarity index 100% rename from yr/examples/now_json.py rename to ayr/examples/now_json.py diff --git a/yr/examples/wuurrd.py b/ayr/examples/wuurrd.py similarity index 100% rename from yr/examples/wuurrd.py rename to ayr/examples/wuurrd.py diff --git a/yr/examples/xml_source.py b/ayr/examples/xml_source.py similarity index 100% rename from yr/examples/xml_source.py rename to ayr/examples/xml_source.py diff --git a/yr/internal/module_path.py b/ayr/internal/module_path.py similarity index 100% rename from yr/internal/module_path.py rename to ayr/internal/module_path.py diff --git a/yr/languages/en.json b/ayr/languages/en.json similarity index 100% rename from yr/languages/en.json rename to ayr/languages/en.json diff --git a/yr/languages/nb.json b/ayr/languages/nb.json similarity index 100% rename from yr/languages/nb.json rename to ayr/languages/nb.json diff --git a/yr/languages/nn.json b/ayr/languages/nn.json similarity index 100% rename from yr/languages/nn.json rename to ayr/languages/nn.json diff --git a/yr/libyr.py b/ayr/libayr.py similarity index 77% rename from yr/libyr.py rename to ayr/libayr.py index 615a482..4f6d773 100644 --- a/yr/libyr.py +++ b/ayr/libayr.py @@ -3,8 +3,8 @@ import logging import json import xmltodict # <~ the only external dependency -from yr.utils import Connect, Location, API_Locationforecast, Language, YrException - +from ayr.utils import Connect, Location, API_Locationforecast, Language, YrException +import asyncio class Yr: @@ -26,16 +26,17 @@ def py2result(self, python, as_json=False): # default is return result as dicti else: return python - def forecast(self, as_json=False): + async def forecast(self, as_json=False): + data = await self.data() if self.coordinates: - times = self.dictionary['weatherdata']['product']['time'] + times = data['weatherdata']['product']['time'] else: - times = self.dictionary['weatherdata']['forecast']['tabular']['time'] - for time in times: - yield self.py2result(time, as_json) + times = data['weatherdata']['forecast']['tabular']['time'] + return [self.py2result(time, as_json) for time in times] - def now(self, as_json=False): - return next(self.forecast(as_json)) + async def now(self, as_json=False): + forecast = await self.forecast(as_json) + return forecast[0] def __init__( self, @@ -84,44 +85,54 @@ def __init__( raise YrException('location_name or location_xyz parameter must be set') self.connect = Connect(location=self.location) - self.xml_source = self.connect.read() - self.dictionary = self.xml2dict(self.xml_source) + self.xml_source = None + self.dictionary = None self.credit = self.language.dictionary['credit'] -if __name__ == '__main__': - logging.basicConfig(level=logging.DEBUG) + async def data(self): + if self.dictionary is None: + self.xml_source = await self.connect.read() + self.dictionary = self.xml2dict(self.xml_source) + return self.dictionary + +async def main(): logging.info('starting __main__') - weatherdata = Yr( + weatherdata = await Yr( location_name='Czech_Republic/Prague/Prague', forecast_link='forecast', language_name='en', ).now(as_json=True) # print(weatherdata) - weatherdata = Yr( + weatherdata = await Yr( location_name='Czech_Republic/Prague/Prague', forecast_link='forecast_hour_by_hour', language_name='en', ).now(as_json=True) # print(weatherdata) - weatherdata = Yr( + weatherdata = await Yr( location_xyz=(14.4656239, 50.0596696, 11), language_name='en', ).now(as_json=True) # print(weatherdata) - weatherdata = Yr( + weatherdata = await Yr( coordinates=(50.0596696, 14.4656239, 11), language_name='en', ).now(as_json=True) # print(weatherdata) - weatherdata = Yr( + weatherdata = await Yr( coordinates=(63.4066631, 10.4426724, 10), language_name='en' ).now(as_json=True) # print(weatherdata) logging.info('stopping __main__') + +if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + loop = asyncio.get_event_loop() + loop.run_until_complete(main()) \ No newline at end of file diff --git a/yr/utils.py b/ayr/utils.py similarity index 96% rename from yr/utils.py rename to ayr/utils.py index 92ee9ff..a6d53c8 100644 --- a/yr/utils.py +++ b/ayr/utils.py @@ -5,9 +5,9 @@ import json # Language import tempfile # Cache import datetime # Cache -import urllib.request # Connect import urllib.parse # Location import xmltodict +import aiohttp log = logging.getLogger(__name__) @@ -141,7 +141,7 @@ class Connect(YrObject): def __init__(self, location): self.location = location - def read(self): + async def read(self): try: log.info('weatherdata request: {}, forecast-link: {}'.format( self.location.location_name, @@ -150,10 +150,11 @@ def read(self): cache = Cache(self.location) if not cache.exists() or not cache.is_fresh(): log.info('read online: {}'.format(self.location.url)) - response = urllib.request.urlopen(self.location.url) - if response.status != 200: - raise - weatherdata = response.read().decode(self.encoding) + async with aiohttp.ClientSession() as session: + async with session.get(self.location.url) as response: + if response.status != 200: + raise + weatherdata = await response.text() cache.dump(weatherdata) else: weatherdata = cache.load() diff --git a/setup.py b/setup.py deleted file mode 100644 index 8db70fa..0000000 --- a/setup.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python3 - -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - -setup( - name='python-yr', - version='1.4.6', - description='Get the forecast from the norwegian wheather service yr.no in python', - long_description=open('README.rst').read() + '\n' + open('CHANGES.rst').read(), - author='Alexander Hansen', - author_email='alexander@alexanderhansen.no', - maintainer='Hugo Shamrock', - maintainer_email='hugo.shamrock@gmail.com', - url='https://github.com/wckd/python-yr', - packages=['yr'], - classifiers=[ # https://pypi.python.org/pypi?%3Aaction=list_classifiers - 'Programming Language :: Python :: 3', - 'Programming Language :: Python', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', - 'Operating System :: OS Independent', - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Topic :: Internet', - ], - package_data={ - 'yr': [ - 'languages/*.json', - ], - }, - install_requires=['xmltodict'], # $$solve$$ ~> /usr/lib/python3.4/distutils/dist.py:260: UserWarning: Unknown distribution option: 'install_requires' warnings.warn(msg) -) From a67bbcf5bf668eb59c2cf8b5803f2e90f30940f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20von=20Streng=20H=C3=A6hre?= Date: Sun, 16 Jun 2019 18:34:15 +0200 Subject: [PATCH 79/79] Setup script --- README.rst | 4 ++-- setup.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 setup.py diff --git a/README.rst b/README.rst index daea923..6249fbb 100755 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ ========= -python-yr +python-ayr ========= Asynchronous library for the norwegian weather service YR.no_ in Python_. Forked from python-yr_ by wkcd_. @@ -59,4 +59,4 @@ This returns .. _YR.no: http://www.yr.no/ .. _Python: http://www.python.org/ .. _python-yr: https://github.com/wckd/python-yr/ -.. -wkcd: https://github.com/wckd/python-yr/ \ No newline at end of file +.. -wkcd: https://github.com/wckd/python-yr/ diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..fa04e7a --- /dev/null +++ b/setup.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 + +try: + from setuptools import setup +except ImportError: + from distutils.core import setup + +setup( + name='python-ayr', + version='0.0.1', + description='Asynchronously get the forecast from the norwegian weather service yr.no in python', + long_description=open('README.rst').read(), + author='Kristian von Streng Haehre', + author_email='kristian.vsh@gmail.com', + url='https://github.com/vonstring/python-ayr', + packages=['ayr'], + classifiers=[ # https://pypi.python.org/pypi?%3Aaction=list_classifiers + 'Programming Language :: Python :: 3', + 'Programming Language :: Python', + 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'Operating System :: OS Independent', + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Topic :: Internet', + ], + package_data={ + 'ayr': [ + 'languages/*.json', + ], + }, + install_requires=['xmltodict', 'aiohttp'], # $$solve$$ ~> /usr/lib/python3.4/distutils/dist.py:260: UserWarning: Unknown distribution option: 'install_requires' warnings.warn(msg) +)