paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix in datetime

Browse source
This commit is contained in:
Antonio de la Rosa 2015-12-28 14:22:57 +01:00
parent ded04f96b0
commit 3aaba5e7a1
3 changed files with 51 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

43
paramecio/citoplasma/datetime.py
View file

@ -25,10 +25,18 @@ from settings import config
# Next convert to # Next convert to
locale='es_ES'
format_date="yyyy/LL/dd"
format_time="HH:mm:ss"
timezone='UTC'
if hasattr(config, 'timezone'): if hasattr(config, 'timezone'):
timezone=config.timezone timezone=config.timezone
else:
timezone='UTC' #if hasattr
tzutc=get_timezone('UTC') tzutc=get_timezone('UTC')
@ -74,20 +82,33 @@ def obtain_fields_time(time):
return year, month, day, hour, minute, second return year, month, day, hour, minute, second
# In the format of tzinfo # In the format of tzinfo
def format_tztime(time): def format_tztime(time, tzc=None):
if tzc==None:
tzc=tz
#try:
year, month, day, hour, minute, second=obtain_fields_time(time) year, month, day, hour, minute, second=obtain_fields_time(time)
t=datetime(year, month, day, hour, minute, second) t=datetime(year, month, day, hour, minute, second)
return format_datetime(t, locale="es_ES", tzinfo=tz) return format_datetime(t, format_time, tzinfo=tzc)
#except: def format_tzdate(time, tzc=None):
if tzc==None:
tzc=tz
year, month, day, hour, minute, second=obtain_fields_time(time)
t=datetime(year, month, day, hour, minute, second)
return format_datetime(t, format_date, tzinfo=tzc)
# return timenow() # return timenow()
def obtain_timezone(timezone):
return get_timezone(timezone)

2
paramecio/cromosoma/coreforms.py
View file

@ -31,7 +31,7 @@ class BaseForm:
value=str(value) value=str(value)
return value.replace('"', '"') return value.replace('"', '"').replace("'", ''')
class TextForm(BaseForm): class TextForm(BaseForm):

21
tests/datetimetest.py
View file

@ -6,11 +6,26 @@ class TestFieldMethods(unittest.TestCase):
def test_timenow(self): def test_timenow(self):
time=datetime.normalize_time(2012, 12, 21, 00, 24, 21) time=datetime.normalize_time(2012, 12, 21, 23, 24, 21)
self.assertEqual(time, '20121221002421') self.assertEqual(time, '20121221232421')
value=datetime.format_tztime(time) value=datetime.format_tztime(time)
self.assertEqual(value, '21/12/2012 00:24:21') self.assertEqual(value, '23:24:21')
value=datetime.format_tzdate(time)
self.assertEqual(value, '2012/12/21')
tz=datetime.obtain_timezone('Europe/Madrid')
value=datetime.format_tzdate(time, tz)
self.assertEqual(value, '2012/12/22')
value=datetime.format_tztime(time, tz)
self.assertEqual(value, '00:24:21')