nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

capabilities.weather.Current: fix default value for date

Browse source 
Signed-off-by: Matthieu Weber <mweber+weboob@free.fr>
Signed-off-by: Romain Bignon <romain@symlink.me>
This commit is contained in:
Matthieu Weber 2015-02-08 20:56:40 +02:00 • committed by Romain Bignon
commit 3e5856d02a
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
weboob/capabilities/weather.py
View file

@ -21,7 +21,7 @@
from datetime import datetime, date from datetime import datetime, date
from .base import Capability, BaseObject, Field, FloatField, \ from .base import Capability, BaseObject, Field, FloatField, \
StringField, UserError StringField, UserError, NotLoaded
from .date import DateField from .date import DateField
__all__ = ['Forecast', 'Current', 'City', 'CityNotFound', 'Temperature', 'CapWeather'] __all__ = ['Forecast', 'Current', 'City', 'CityNotFound', 'Temperature', 'CapWeather']
@ -32,8 +32,8 @@ class Temperature(BaseObject):
value = FloatField('Temperature value') value = FloatField('Temperature value')
unit = StringField('Input unit') unit = StringField('Input unit')
def __init__(self, value='', unit = u''): def __init__(self, value=NotLoaded, unit = u''):
BaseObject.__init__(self, value) BaseObject.__init__(self, unicode(value))
self.value = value self.value = value
if unit not in [u'C', u'F']: if unit not in [u'C', u'F']:
unit = u'' unit = u''
@ -69,7 +69,7 @@ class Forecast(BaseObject):
high = Field('High temperature', Temperature) high = Field('High temperature', Temperature)
text = StringField('Comment on forecast') text = StringField('Comment on forecast')
def __init__(self, date='', low=None, high=None, text=None, unit=None): def __init__(self, date=NotLoaded, low=None, high=None, text=None, unit=None):
BaseObject.__init__(self, unicode(date)) BaseObject.__init__(self, unicode(date))
self.date = date self.date = date
self.low = Temperature(low, unit) self.low = Temperature(low, unit)
@ -85,7 +85,7 @@ class Current(BaseObject):
text = StringField('Comment about current weather') text = StringField('Comment about current weather')
temp = Field('Current temperature', Temperature) temp = Field('Current temperature', Temperature)
def __init__(self, date='', temp=None, text=None, unit=None): def __init__(self, date=NotLoaded, temp=None, text=None, unit=None):
BaseObject.__init__(self, unicode(date)) BaseObject.__init__(self, unicode(date))
self.date = date self.date = date
self.text = text self.text = text